rcap 2.7.3 → 2.7.4

data/lib/rcap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RCAP
-  VERSION = '2.7.3'
+  VERSION = '2.7.4'
 end

data/spec/alert_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe(RCAP::Alert) do
   describe('initialising') do
-
     context('a CAP 1.0 alert') do
       before(:each) do
         @original_alert = RCAP::CAP_1_0::Alert.new do |alert|
@@ -15,14 +14,14 @@ describe(RCAP::Alert) do
           ['Address 1', 'Address 2'].each do |address|
             alert.addresses << address
           end
-          %w(Code1 Code2).each do |code|
+          %w[Code1 Code2].each do |code|
             alert.codes << code
           end
           alert.note = 'Note'
           ['1.0,1', '1.0,2'].each do |reference|
             alert.references << reference
           end
-          %w(Incident1 Incident2).each do |incident|
+          %w[Incident1 Incident2].each do |incident|
             alert.incidents << incident
           end
           2.times { alert.add_info }
@@ -87,14 +86,14 @@ describe(RCAP::Alert) do
           ['Address 1', 'Address 2'].each do |address|
             alert.addresses << address
           end
-          %w(Code1 Code2).each do |code|
+          %w[Code1 Code2].each do |code|
             alert.codes << code
           end
           alert.note = 'Note'
           ['1,1,1', '1,1,2'].each do |reference|
             alert.references << reference
           end
-          %w(Incident1 Incident2).each do |incident|
+          %w[Incident1 Incident2].each do |incident|
             alert.incidents << incident
           end
           2.times { alert.add_info }
@@ -102,7 +101,7 @@ describe(RCAP::Alert) do
       end
 
       shared_examples_for('it has parsed a CAP 1.1 alert correctly') do
-        it('should use the correct CAP Version') { @alert.class.should       == RCAP::CAP_1_1::Alert }
+        it('should use the correct CAP Version') { @alert.class.should == RCAP::CAP_1_1::Alert }
         it('should parse identifier correctly') { @alert.identifier.should  == @original_alert.identifier }
         it('should parse sender correctly')     { @alert.sender.should      == @original_alert.sender }
         it('should parse sent correctly')       { @alert.sent.should(be_within(1).of(@original_alert.sent)) }
@@ -159,14 +158,14 @@ describe(RCAP::Alert) do
           ['Address 1', 'Address 2'].each do |address|
             alert.addresses << address
           end
-          %w(Code1 Code2).each do |code|
+          %w[Code1 Code2].each do |code|
             alert.codes << code
           end
           alert.note = 'Note'
           ['1,1,1', '1,1,2'].each do |reference|
             alert.references << reference
           end
-          %w(Incident1 Incident2).each do |incident|
+          %w[Incident1 Incident2].each do |incident|
             alert.incidents << incident
           end
           2.times { alert.add_info }
@@ -174,7 +173,7 @@ describe(RCAP::Alert) do
       end
 
       shared_examples_for('it has parsed a CAP 1.2 alert correctly') do
-        it('should use the correct CAP Version') { @alert.class.should       == RCAP::CAP_1_2::Alert }
+        it('should use the correct CAP Version') { @alert.class.should == RCAP::CAP_1_2::Alert }
         it('should parse identifier correctly') { @alert.identifier.should  == @original_alert.identifier }
         it('should parse sender correctly')     { @alert.sender.should      == @original_alert.sender }
         it('should parse sent correctly')       { @alert.sent.should(be_within(1).of(@original_alert.sent)) }

data/spec/cap_1_0/alert_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe(RCAP::CAP_1_0::Alert) do
   context('on initialisation') do
-    before(:each)  do
+    before(:each) do
       @alert = RCAP::CAP_1_0::Alert.new
 
       @original_alert = RCAP::CAP_1_0::Alert.new do |alert|
@@ -15,17 +15,17 @@ describe(RCAP::CAP_1_0::Alert) do
         ['Address 1', 'Address 2'].each do |address|
           alert.addresses << address
         end
-        %w(Code1 Code2).each do |code|
+        %w[Code1 Code2].each do |code|
           alert.codes << code
         end
         alert.note = 'Note'
-        %w(Sender1 Sender2).each do |sender|
+        %w[Sender1 Sender2].each do |sender|
           a = RCAP::CAP_1_0::Alert.new do |a|
             a.sender = sender
           end
           alert.references << a.to_reference
         end
-        %w(Incident1 Incident2).each do |incident|
+        %w[Incident1 Incident2].each do |incident|
           alert.incidents << incident
         end
         2.times { alert.add_info }
@@ -75,7 +75,6 @@ describe(RCAP::CAP_1_0::Alert) do
       end
 
       it_should_behave_like('a successfully parsed CAP 1.0 alert')
-
     end
 
     context('from YAML') do

data/spec/cap_1_0/area_spec.rb

@@ -66,9 +66,8 @@ describe(RCAP::CAP_1_0::Area) do
 
     context('from XML') do
       before(:each) do
-
         @alert = RCAP::CAP_1_0::Alert.new
-        @alert.add_info.areas <<  @original_area
+        @alert.add_info.areas << @original_area
         @xml_string = @alert.to_xml
         @xml_document = REXML::Document.new(@xml_string)
         @info_xml_element = RCAP.xpath_first(@xml_document.root, RCAP::CAP_1_0::Info::XPATH, RCAP::CAP_1_0::Alert::XMLNS)
@@ -81,7 +80,6 @@ describe(RCAP::CAP_1_0::Area) do
 
     context('from YAML Data') do
       before(:each) do
-
         @area = RCAP::CAP_1_0::Area.from_yaml_data(YAML.load(@original_area.to_yaml))
       end
 
@@ -90,7 +88,6 @@ describe(RCAP::CAP_1_0::Area) do
 
     context('from a hash') do
       before(:each) do
-
         @area = RCAP::CAP_1_0::Area.from_h(@original_area.to_h)
       end
 
@@ -129,27 +126,27 @@ describe(RCAP::CAP_1_0::Area) do
       end
 
       it('should export the area description correctly') do
-        @area_hash[ RCAP::CAP_1_0::Area::AREA_DESC_KEY].should == @area.area_desc
+        @area_hash[RCAP::CAP_1_0::Area::AREA_DESC_KEY].should == @area.area_desc
       end
 
       it('should export the altitude correctly') do
-        @area_hash[ RCAP::CAP_1_0::Area::ALTITUDE_KEY].should == @area.altitude
+        @area_hash[RCAP::CAP_1_0::Area::ALTITUDE_KEY].should == @area.altitude
       end
 
       it('should set the ceiling correctly') do
-        @area_hash[ RCAP::CAP_1_0::Area::CEILING_KEY].should == @area.ceiling
+        @area_hash[RCAP::CAP_1_0::Area::CEILING_KEY].should == @area.ceiling
       end
 
       it('should export the circles correctly') do
-        @area_hash[ RCAP::CAP_1_0::Area::CIRCLES_KEY].should == @area.circles.map { |circle| circle.to_a }
+        @area_hash[RCAP::CAP_1_0::Area::CIRCLES_KEY].should == @area.circles.map { |circle| circle.to_a }
       end
 
       it('should export the geocodes correctly') do
-        @area_hash[ RCAP::CAP_1_0::Area::GEOCODES_KEY].should == @area.geocodes.map { |geocode| geocode.to_h }
+        @area_hash[RCAP::CAP_1_0::Area::GEOCODES_KEY].should == @area.geocodes.map { |geocode| geocode.to_h }
       end
 
       it('should export the polygons correctly') do
-        @area_hash[ RCAP::CAP_1_0::Area::POLYGONS_KEY].should == @area.polygons.map { |polygon| polygon.to_h }
+        @area_hash[RCAP::CAP_1_0::Area::POLYGONS_KEY].should == @area.polygons.map { |polygon| polygon.to_h }
       end
     end
   end

data/spec/cap_1_0/event_code_spec.rb

@@ -9,7 +9,7 @@ describe(RCAP::CAP_1_0::EventCode) do
           event_code.value = 'value'
         end
         @alert = RCAP::CAP_1_0::Alert.new
-        @alert.add_info.event_codes <<  @original_event_code
+        @alert.add_info.event_codes << @original_event_code
         @xml_string = @alert.to_xml
         @xml_document = REXML::Document.new(@xml_string)
         @info_xml_element = RCAP.xpath_first(@xml_document.root, RCAP::CAP_1_0::Info::XPATH, RCAP::CAP_1_0::Alert::XMLNS)

data/spec/cap_1_0/geocode_spec.rb

@@ -9,7 +9,7 @@ describe(RCAP::CAP_1_0::Geocode) do
           geocode.value = 'value'
         end
         @alert = RCAP::CAP_1_0::Alert.new
-        @alert.add_info.add_area.geocodes <<  @original_geocode
+        @alert.add_info.add_area.geocodes << @original_geocode
         @xml_string = @alert.to_xml
         @xml_document = REXML::Document.new(@xml_string)
         @info_xml_element = RCAP.xpath_first(@xml_document.root, RCAP::CAP_1_0::Info::XPATH, RCAP::CAP_1_0::Alert::XMLNS)

data/spec/cap_1_0/info_spec.rb

@@ -26,21 +26,21 @@ describe(RCAP::CAP_1_0::Info) do
         resource.uri = 'http://tempuri.org/resource'
       end
 
-      [%w(name1 value1), %w(name2 value2)].each do |name, value|
+      [%w[name1 value1], %w[name2 value2]].each do |name, value|
         info.add_event_code do |event_code|
           event_code.name = name
           event_code.value = value
         end
       end
 
-      [%w(name1 value1), %w(name2 value2)].each do |name, value|
+      [%w[name1 value1], %w[name2 value2]].each do |name, value|
         info.add_parameter do |parameter|
           parameter.name = name
           parameter.value = value
         end
       end
 
-      %w(Area1 Area2).each do |area_desc|
+      %w[Area1 Area2].each do |area_desc|
         info.add_area do |area|
           area.area_desc = area_desc
         end
@@ -72,25 +72,25 @@ describe(RCAP::CAP_1_0::Info) do
     it('should have no parameters')               { @info.parameters.should(be_empty) }
 
     shared_examples_for('it can parse into a CAP 1.0 Info object') do
-      it('should parse categories correctly') {     @info.categories.should_not(be_nil); @info.categories.should     ==    @original_info.categories }
-      it('should parse event correctly') {          @info.event.should_not(be_nil); @info.event.should          ==    @original_info.event }
-      it('should parse urgency correctly') {        @info.urgency.should_not(be_nil); @info.urgency.should        ==    @original_info.urgency }
-      it('should parse severity correctly') {       @info.severity.should_not(be_nil); @info.severity.should       ==    @original_info.severity }
-      it('should parse certainty correctly') {      @info.certainty.should_not(be_nil); @info.certainty.should      ==    @original_info.certainty }
-      it('should parse audience correctly') {       @info.audience.should_not(be_nil); @info.audience.should       ==    @original_info.audience }
+      it('should parse categories correctly') {     @info.categories.should_not(be_nil); @info.categories.should == @original_info.categories }
+      it('should parse event correctly') {          @info.event.should_not(be_nil); @info.event.should == @original_info.event }
+      it('should parse urgency correctly') {        @info.urgency.should_not(be_nil); @info.urgency.should == @original_info.urgency }
+      it('should parse severity correctly') {       @info.severity.should_not(be_nil); @info.severity.should == @original_info.severity }
+      it('should parse certainty correctly') {      @info.certainty.should_not(be_nil); @info.certainty.should == @original_info.certainty }
+      it('should parse audience correctly') {       @info.audience.should_not(be_nil); @info.audience.should == @original_info.audience }
       it('should parse effective correctly') {      @info.effective.should_not(be_nil); @info.effective.should(be_within(Rational(1, 86_400)).of(@original_info.effective)) }
       it('should parse onset correctly') {          @info.onset.should_not(be_nil); @info.onset.should(be_within(Rational(1, 86_400)).of(@original_info.onset)) }
       it('should parse expires correctly') {        @info.expires.should_not(be_nil); @info.expires.should(be_within(Rational(1, 86_400)).of(@original_info.expires)) }
-      it('should parse sender_name correctly') {    @info.sender_name.should_not(be_nil); @info.sender_name.should    ==    @original_info.sender_name }
-      it('should parse headline correctly') {       @info.headline.should_not(be_nil); @info.headline.should       ==    @original_info.headline }
+      it('should parse sender_name correctly') {    @info.sender_name.should_not(be_nil); @info.sender_name.should == @original_info.sender_name }
+      it('should parse headline correctly') {       @info.headline.should_not(be_nil); @info.headline.should == @original_info.headline }
       it('should parse description correctly') {    @info.description.should_not(be_nil); @info.description.should    ==    @original_info.description }
       it('should parse instruction correctly') {    @info.instruction.should_not(be_nil); @info.instruction.should    ==    @original_info.instruction }
-      it('should parse web correctly') {            @info.web.should_not(be_nil); @info.web.should            ==    @original_info.web }
-      it('should parse contact correctly') {        @info.contact.should_not(be_nil); @info.contact.should        ==    @original_info.contact }
-      it('should parse event_codes correctly') {    @info.event_codes.should_not(be_nil); @info.event_codes.should    ==    @original_info.event_codes }
-      it('should parse parameters correctly') {     @info.parameters.should_not(be_nil); @info.parameters.should     ==    @original_info.parameters }
-      it('should parse resources correctly') {      @info.resources.should_not(be_nil); @info.resources.map(&:to_s).should      ==    @original_info.resources.map(&:to_s) }
-      it('should parse areas correctly') {          @info.areas.should_not(be_nil); @info.areas.should          ==    @original_info.areas }
+      it('should parse web correctly') {            @info.web.should_not(be_nil); @info.web.should == @original_info.web }
+      it('should parse contact correctly') {        @info.contact.should_not(be_nil); @info.contact.should == @original_info.contact }
+      it('should parse event_codes correctly') {    @info.event_codes.should_not(be_nil); @info.event_codes.should == @original_info.event_codes }
+      it('should parse parameters correctly') {     @info.parameters.should_not(be_nil); @info.parameters.should == @original_info.parameters }
+      it('should parse resources correctly') {      @info.resources.should_not(be_nil); @info.resources.map(&:to_s).should == @original_info.resources.map(&:to_s) }
+      it('should parse areas correctly') {          @info.areas.should_not(be_nil); @info.areas.should == @original_info.areas }
     end
 
     context('from XML') do
@@ -119,7 +119,7 @@ describe(RCAP::CAP_1_0::Info) do
     before(:each) do
       @info = RCAP::CAP_1_0::Info.new do |info|
         info.event = 'Info Event'
-        info.categories <<  RCAP::CAP_1_0::Info::CATEGORY_GEO
+        info.categories << RCAP::CAP_1_0::Info::CATEGORY_GEO
         info.urgency = RCAP::CAP_1_0::Info::URGENCY_IMMEDIATE
         info.severity = RCAP::CAP_1_0::Info::SEVERITY_EXTREME
         info.certainty = RCAP::CAP_1_0::Info::CERTAINTY_VERY_LIKELY
@@ -158,83 +158,83 @@ describe(RCAP::CAP_1_0::Info) do
       end
 
       it('should export the language correctly') do
-        @info_hash[ RCAP::CAP_1_0::Info::LANGUAGE_KEY].should == @info.language
+        @info_hash[RCAP::CAP_1_0::Info::LANGUAGE_KEY].should == @info.language
       end
 
       it('should export the categories') do
-        @info_hash[ RCAP::CAP_1_0::Info::CATEGORIES_KEY].should == @info.categories
+        @info_hash[RCAP::CAP_1_0::Info::CATEGORIES_KEY].should == @info.categories
       end
 
       it('should export the event') do
-        @info_hash[ RCAP::CAP_1_0::Info::EVENT_KEY].should == @info.event
+        @info_hash[RCAP::CAP_1_0::Info::EVENT_KEY].should == @info.event
       end
 
       it('should export the urgency') do
-        @info_hash[ RCAP::CAP_1_0::Info:: URGENCY_KEY].should == @info.urgency
+        @info_hash[RCAP::CAP_1_0::Info:: URGENCY_KEY].should == @info.urgency
       end
 
       it('should export the severity') do
-        @info_hash[ RCAP::CAP_1_0::Info:: SEVERITY_KEY].should == @info.severity
+        @info_hash[RCAP::CAP_1_0::Info:: SEVERITY_KEY].should == @info.severity
       end
 
       it('should export the certainty') do
-        @info_hash[ RCAP::CAP_1_0::Info:: CERTAINTY_KEY].should == @info.certainty
+        @info_hash[RCAP::CAP_1_0::Info:: CERTAINTY_KEY].should == @info.certainty
       end
 
       it('should export the audience') do
-        @info_hash[ RCAP::CAP_1_0::Info:: AUDIENCE_KEY].should == @info.audience
+        @info_hash[RCAP::CAP_1_0::Info:: AUDIENCE_KEY].should == @info.audience
       end
 
       it('should export the effective date') do
-        @info_hash[ RCAP::CAP_1_0::Info::EFFECTIVE_KEY].should == @info.effective.to_s_for_cap
+        @info_hash[RCAP::CAP_1_0::Info::EFFECTIVE_KEY].should == @info.effective.to_s_for_cap
       end
 
       it('should export the onset date') do
-        @info_hash[ RCAP::CAP_1_0::Info::ONSET_KEY].should == @info.onset.to_s_for_cap
+        @info_hash[RCAP::CAP_1_0::Info::ONSET_KEY].should == @info.onset.to_s_for_cap
       end
 
       it('should export the expires date') do
-        @info_hash[ RCAP::CAP_1_0::Info::EXPIRES_KEY].should == @info.expires.to_s_for_cap
+        @info_hash[RCAP::CAP_1_0::Info::EXPIRES_KEY].should == @info.expires.to_s_for_cap
       end
 
       it('should export the sender name') do
-        @info_hash[ RCAP::CAP_1_0::Info::SENDER_NAME_KEY].should == @info.sender_name
+        @info_hash[RCAP::CAP_1_0::Info::SENDER_NAME_KEY].should == @info.sender_name
       end
 
       it('should export the headline') do
-        @info_hash[ RCAP::CAP_1_0::Info::HEADLINE_KEY].should == @info.headline
+        @info_hash[RCAP::CAP_1_0::Info::HEADLINE_KEY].should == @info.headline
       end
 
       it('should export the description') do
-        @info_hash[ RCAP::CAP_1_0::Info::DESCRIPTION_KEY].should == @info.description
+        @info_hash[RCAP::CAP_1_0::Info::DESCRIPTION_KEY].should == @info.description
       end
 
       it('should export the instruction') do
-        @info_hash[ RCAP::CAP_1_0::Info::INSTRUCTION_KEY].should == @info.instruction
+        @info_hash[RCAP::CAP_1_0::Info::INSTRUCTION_KEY].should == @info.instruction
       end
 
       it('should export the web address ') do
-        @info_hash[ RCAP::CAP_1_0::Info::WEB_KEY].should == @info.web
+        @info_hash[RCAP::CAP_1_0::Info::WEB_KEY].should == @info.web
       end
 
       it('should export the contact') do
-        @info_hash[ RCAP::CAP_1_0::Info::CONTACT_KEY].should == @info.contact
+        @info_hash[RCAP::CAP_1_0::Info::CONTACT_KEY].should == @info.contact
       end
 
       it('should export the event codes') do
-        @info_hash[ RCAP::CAP_1_0::Info::EVENT_CODES_KEY].should == @info.event_codes.map { |event_code| event_code.to_h }
+        @info_hash[RCAP::CAP_1_0::Info::EVENT_CODES_KEY].should == @info.event_codes.map { |event_code| event_code.to_h }
       end
 
       it('should export the parameters ') do
-        @info_hash[ RCAP::CAP_1_0::Info::PARAMETERS_KEY].should == @info.parameters.map { |parameter| parameter.to_h }
+        @info_hash[RCAP::CAP_1_0::Info::PARAMETERS_KEY].should == @info.parameters.map { |parameter| parameter.to_h }
       end
 
       it('should export the resources ') do
-        @info_hash[ RCAP::CAP_1_0::Info::RESOURCES_KEY].should == @info.resources.map { |resource| resource.to_h }
+        @info_hash[RCAP::CAP_1_0::Info::RESOURCES_KEY].should == @info.resources.map { |resource| resource.to_h }
       end
 
       it('should export the areas') do
-        @info_hash[ RCAP::CAP_1_0::Info::AREAS_KEY].should == @info.areas.map { |area| area.to_h }
+        @info_hash[RCAP::CAP_1_0::Info::AREAS_KEY].should == @info.areas.map { |area| area.to_h }
       end
     end
   end

data/spec/cap_1_0/resource_spec.rb

@@ -86,7 +86,6 @@ describe(RCAP::CAP_1_0::Resource) do
         @resource.digest.should == @original_resource.digest
       end
     end
-
   end
 
   context('when exported') do
@@ -106,29 +105,29 @@ describe(RCAP::CAP_1_0::Resource) do
       end
 
       it('should set the resource description') do
-        @resource_hash[ RCAP::CAP_1_0::Resource::RESOURCE_DESC_KEY].should == @resource.resource_desc
+        @resource_hash[RCAP::CAP_1_0::Resource::RESOURCE_DESC_KEY].should == @resource.resource_desc
       end
 
       it('should set the mime type') do
-        @resource_hash[ RCAP::CAP_1_0::Resource::MIME_TYPE_KEY].should == @resource.mime_type
+        @resource_hash[RCAP::CAP_1_0::Resource::MIME_TYPE_KEY].should == @resource.mime_type
       end
 
       it('should set the size') do
-        @resource_hash[ RCAP::CAP_1_0::Resource::SIZE_KEY].should == @resource.size
+        @resource_hash[RCAP::CAP_1_0::Resource::SIZE_KEY].should == @resource.size
       end
 
       it('should set the URI') do
-        @resource_hash[ RCAP::CAP_1_0::Resource::URI_KEY].should == @resource.uri
+        @resource_hash[RCAP::CAP_1_0::Resource::URI_KEY].should == @resource.uri
       end
 
       it('should set the digest') do
-        @resource_hash[ RCAP::CAP_1_0::Resource::DIGEST_KEY].should == @resource.digest
+        @resource_hash[RCAP::CAP_1_0::Resource::DIGEST_KEY].should == @resource.digest
       end
     end
 
     context('to xml') do
       it('should be successful') do
-        lambda { @resource_xml = @resource.to_xml }.should_not(raise_exception)
+        -> { @resource_xml = @resource.to_xml }.should_not(raise_exception)
       end
     end
   end

data/spec/cap_1_1/alert_spec.rb

@@ -12,14 +12,14 @@ describe(RCAP::CAP_1_1::Alert) do
       ['Address 1', 'Address 2'].each do |address|
         alert.addresses << address
       end
-      %w(Code1 Code2).each do |code|
+      %w[Code1 Code2].each do |code|
         alert.codes << code
       end
-      alert.note        = 'Note'
-      %w(Reference1 Reference2).each do |reference|
+      alert.note = 'Note'
+      %w[Reference1 Reference2].each do |reference|
         alert.references << reference
       end
-      %w(Incident1 Incident2).each do |_incident|
+      %w[Incident1 Incident2].each do |_incident|
       end
       alert.add_info
       alert.add_info
@@ -27,7 +27,7 @@ describe(RCAP::CAP_1_1::Alert) do
   end
 
   context('on initialisation') do
-    before(:each)  do
+    before(:each) do
       @alert = RCAP::CAP_1_1::Alert.new
     end
 
@@ -75,7 +75,6 @@ describe(RCAP::CAP_1_1::Alert) do
       end
 
       it_should_behave_like('a successfully parsed CAP 1.1 alert')
-
     end
 
     context('from YAML') do
@@ -168,7 +167,7 @@ describe(RCAP::CAP_1_1::Alert) do
     context('has an info element and it') do
       it('is not valid') do
         @info = @alert.add_info do |info|
-          info.event      = 'Info Event'
+          info.event = 'Info Event'
           info.categories << RCAP::CAP_1_1::Info::CATEGORY_GEO
           info.urgency    = RCAP::CAP_1_1::Info::URGENCY_IMMEDIATE
           info.severity   = RCAP::CAP_1_1::Info::SEVERITY_EXTREME