rcap 2.5.0 → 2.7.4

data/spec/cap_1_1/parameter_spec.rb

@@ -4,14 +4,13 @@ describe(RCAP::CAP_1_1::Parameter) do
   context('when initialised') do
     context('from XML') do
       before(:each) do
-
         @alert = RCAP::CAP_1_1::Alert.new do |alert|
           alert.add_info.add_parameter do |parameter|
             parameter.name = 'name'
             parameter.value = 'value'
           end
         end
-        @original_parameter  = @alert.infos.first.parameters.first
+        @original_parameter = @alert.infos.first.parameters.first
         @xml_string = @alert.to_xml
         @xml_document = REXML::Document.new(@xml_string)
         @info_xml_element = RCAP.xpath_first(@xml_document.root, RCAP::CAP_1_1::Info::XPATH, RCAP::CAP_1_1::Alert::XMLNS)

data/spec/cap_1_1/polygon_spec.rb

@@ -10,18 +10,13 @@ describe(RCAP::CAP_1_1::Polygon) do
             point.longitude = 0
           end
         end
-        @polygon.should(be_valid)
-      end
-
-      it('does not have any points') do
-        @polygon.points.clear
-        @polygon.should_not(be_valid)
       end
+      @polygon.should(be_valid)
+    end
 
-      it('does not have a valid collection of points') do
-        @polygon.points.first.lattitude = nil
-        @polygon.should_not(be_valid)
-      end
+    it('does not have a valid collection of points') do
+      @polygon.points.first.lattitude = nil
+      @polygon.should_not(be_valid)
     end
   end
 
@@ -102,6 +97,13 @@ describe(RCAP::CAP_1_1::Polygon) do
       end
     end
 
+    context('to geojson') do
+      it('should be valid geojson') do
+        expected = '{"type":"Polygon","coordinates":[[[0,0],[1,1],[2,2]]]}'
+        expect(@polygon.to_geojson).to eq expected
+      end
+    end
+
     context('to a hash') do
       it('should export correctly') do
         @polygon.to_h.should == { RCAP::CAP_1_1::Polygon::POINTS_KEY => @polygon.points.map { |point| point.to_a } }

data/spec/cap_1_1/resource_spec.rb

@@ -153,33 +153,33 @@ describe(RCAP::CAP_1_1::Resource) do
       end
 
       it('should set the resource description') do
-        @resource_hash[ RCAP::CAP_1_1::Resource::RESOURCE_DESC_KEY].should == @resource.resource_desc
+        @resource_hash[RCAP::CAP_1_1::Resource::RESOURCE_DESC_KEY].should == @resource.resource_desc
       end
 
       it('should set the mime type') do
-        @resource_hash[ RCAP::CAP_1_1::Resource::MIME_TYPE_KEY].should == @resource.mime_type
+        @resource_hash[RCAP::CAP_1_1::Resource::MIME_TYPE_KEY].should == @resource.mime_type
       end
 
       it('should set the size') do
-        @resource_hash[ RCAP::CAP_1_1::Resource::SIZE_KEY].should == @resource.size
+        @resource_hash[RCAP::CAP_1_1::Resource::SIZE_KEY].should == @resource.size
       end
 
       it('should set the URI') do
-        @resource_hash[ RCAP::CAP_1_1::Resource::URI_KEY].should == @resource.uri
+        @resource_hash[RCAP::CAP_1_1::Resource::URI_KEY].should == @resource.uri
       end
 
       it('should set the dereferenced URI') do
-        @resource_hash[ RCAP::CAP_1_1::Resource::DEREF_URI_KEY].should == @resource.deref_uri
+        @resource_hash[RCAP::CAP_1_1::Resource::DEREF_URI_KEY].should == @resource.deref_uri
       end
 
       it('should set the digest') do
-        @resource_hash[ RCAP::CAP_1_1::Resource::DIGEST_KEY].should == @resource.digest
+        @resource_hash[RCAP::CAP_1_1::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
@@ -209,20 +209,20 @@ describe(RCAP::CAP_1_1::Resource) do
       end
       @content = "1,2\n3,4"
       @encoded_content = Base64.encode64(@content)
-      stub_request(:get, @resource.uri).to_return(status: 200, body: @content)
+      expect(URI).to receive(:parse) { StringIO.new(@content) }
     end
 
     describe('#dereference_uri!') do
       it('should fetch the content and store it in deref_uri as Base64 encoded content') do
-        lambda { @resource.dereference_uri! }.should(change(@resource, :deref_uri).to(@encoded_content))
+        -> { @resource.dereference_uri! }.should(change(@resource, :deref_uri).to(@encoded_content))
       end
 
       it('should generate the correct SHA1 hash') do
-        lambda { @resource.dereference_uri! }.should(change(@resource, :digest).to(Digest::SHA1.hexdigest(@encoded_content)))
+        -> { @resource.dereference_uri! }.should(change(@resource, :digest).to(Digest::SHA1.hexdigest(@encoded_content)))
       end
 
       it('should set the size in bytes') do
-        lambda { @resource.dereference_uri! }.should(change(@resource, :size).to(@encoded_content.bytesize))
+        -> { @resource.dereference_uri! }.should(change(@resource, :size).to(@encoded_content.bytesize))
       end
     end
   end
@@ -241,11 +241,11 @@ describe(RCAP::CAP_1_1::Resource) do
 
     describe('#calculate_hash_and_size') do
       it('should generate the correct SHA1 hash') do
-        lambda { @resource.calculate_hash_and_size }.should(change(@resource, :digest).to(Digest::SHA1.hexdigest(@encoded_content)))
+        -> { @resource.calculate_hash_and_size }.should(change(@resource, :digest).to(Digest::SHA1.hexdigest(@encoded_content)))
       end
 
       it('should set the size in bytes') do
-        lambda { @resource.calculate_hash_and_size }.should(change(@resource, :size).to(@encoded_content.bytesize))
+        -> { @resource.calculate_hash_and_size }.should(change(@resource, :size).to(@encoded_content.bytesize))
       end
     end
 

data/spec/cap_1_2/alert_spec.rb

@@ -12,14 +12,14 @@ describe(RCAP::CAP_1_2::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|
         alert.incidents << incident
       end
       2.times do
@@ -29,7 +29,7 @@ describe(RCAP::CAP_1_2::Alert) do
   end
 
   context('on initialisation') do
-    before(:each)  do
+    before(:each) do
       @alert = RCAP::CAP_1_2::Alert.new
     end
 
@@ -77,7 +77,6 @@ describe(RCAP::CAP_1_2::Alert) do
       end
 
       it_should_behave_like('a successfully parsed CAP 1.2 alert')
-
     end
 
     context('from YAML') do
@@ -180,7 +179,7 @@ describe(RCAP::CAP_1_2::Alert) do
 
       it('has in invalid info attribute') do
         @info = RCAP::CAP_1_2::Info.new do |info|
-          info.event      = 'Info Event'
+          info.event = 'Info Event'
           info.categories << RCAP::CAP_1_2::Info::CATEGORY_GEO
           info.urgency    = RCAP::CAP_1_2::Info::URGENCY_IMMEDIATE
           info.severity   = RCAP::CAP_1_2::Info::SEVERITY_EXTREME
@@ -219,7 +218,7 @@ describe(RCAP::CAP_1_2::Alert) do
     describe('#to_xml') do
       context('with pretty_print = true') do
         it('should not raise an exception') do
-          lambda { @alert.to_xml(true) }.should_not(raise_exception)
+          -> { @alert.to_xml(true) }.should_not(raise_exception)
         end
       end
     end

data/spec/cap_1_2/area_spec.rb

@@ -108,27 +108,27 @@ describe(RCAP::CAP_1_2::Area) do
       end
 
       it('should export the area description correctly') do
-        @area_hash[ RCAP::CAP_1_2::Area::AREA_DESC_KEY].should == @area.area_desc
+        @area_hash[RCAP::CAP_1_2::Area::AREA_DESC_KEY].should == @area.area_desc
       end
 
       it('should export the altitude correctly') do
-        @area_hash[ RCAP::CAP_1_2::Area::ALTITUDE_KEY].should == @area.altitude
+        @area_hash[RCAP::CAP_1_2::Area::ALTITUDE_KEY].should == @area.altitude
       end
 
       it('should set the ceiling correctly') do
-        @area_hash[ RCAP::CAP_1_2::Area::CEILING_KEY].should == @area.ceiling
+        @area_hash[RCAP::CAP_1_2::Area::CEILING_KEY].should == @area.ceiling
       end
 
       it('should export the circles correctly') do
-        @area_hash[ RCAP::CAP_1_2::Area::CIRCLES_KEY].should == @area.circles.map { |circle| circle.to_a }
+        @area_hash[RCAP::CAP_1_2::Area::CIRCLES_KEY].should == @area.circles.map { |circle| circle.to_a }
       end
 
       it('should export the geocodes correctly') do
-        @area_hash[ RCAP::CAP_1_2::Area::GEOCODES_KEY].should == @area.geocodes.map { |geocode| geocode.to_h }
+        @area_hash[RCAP::CAP_1_2::Area::GEOCODES_KEY].should == @area.geocodes.map { |geocode| geocode.to_h }
       end
 
       it('should export the polygons correctly') do
-        @area_hash[ RCAP::CAP_1_2::Area::POLYGONS_KEY].should == @area.polygons.map { |polygon| polygon.to_h }
+        @area_hash[RCAP::CAP_1_2::Area::POLYGONS_KEY].should == @area.polygons.map { |polygon| polygon.to_h }
       end
     end
   end

data/spec/cap_1_2/circle_spec.rb

@@ -93,6 +93,15 @@ describe(RCAP::CAP_1_2::Circle) do
       @circle = RCAP::CAP_1_2::Circle.new(&@circle_builder)
     end
 
+    context('to geojson') do
+      it('should be valid geojson') do
+        @circle.longitude = 5.6
+        expected = '{"type":"Feature","geometry":{"type":"Point",' \
+          '"coordinates":[5.6,0]},"properties":{"radius":1}}'
+        expect(@circle.to_geojson).to eq expected
+      end
+    end
+
     context('to hash') do
       it('should be correct') do
         @circle.to_h.should == { 'radius' => 1, 'lattitude' => 0, 'longitude' => 0 }

data/spec/cap_1_2/info_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe(RCAP::CAP_1_2::Info) do
   before(:each) do
-
     @info_builder = lambda do |info|
       info.categories << RCAP::CAP_1_2::Info::CATEGORY_GEO
       info.categories << RCAP::CAP_1_2::Info::CATEGORY_FIRE
@@ -22,7 +21,7 @@ describe(RCAP::CAP_1_2::Info) do
       info.instruction = 'Instruction'
       info.web = 'http://website'
       info.contact = 'contact@address'
-      [%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
@@ -34,14 +33,14 @@ describe(RCAP::CAP_1_2::Info) do
         resource.mime_type = 'mime/type'
       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
@@ -273,7 +272,7 @@ describe(RCAP::CAP_1_2::Info) do
   context('is not valid if it') do
     before(:each) do
       @info = RCAP::CAP_1_2::Info.new do |info|
-        info.event      = 'Info Event'
+        info.event = 'Info Event'
         info.categories << RCAP::CAP_1_2::Info::CATEGORY_GEO
         info.urgency    = RCAP::CAP_1_2::Info::URGENCY_IMMEDIATE
         info.severity   = RCAP::CAP_1_2::Info::SEVERITY_EXTREME
@@ -318,87 +317,87 @@ describe(RCAP::CAP_1_2::Info) do
       end
 
       it('should export the language correctly') do
-        @info_hash[ RCAP::CAP_1_2::Info::LANGUAGE_KEY].should == @info.language
+        @info_hash[RCAP::CAP_1_2::Info::LANGUAGE_KEY].should == @info.language
       end
 
       it('should export the categories') do
-        @info_hash[ RCAP::CAP_1_2::Info::CATEGORIES_KEY].should == @info.categories
+        @info_hash[RCAP::CAP_1_2::Info::CATEGORIES_KEY].should == @info.categories
       end
 
       it('should export the event') do
-        @info_hash[ RCAP::CAP_1_2::Info::EVENT_KEY].should == @info.event
+        @info_hash[RCAP::CAP_1_2::Info::EVENT_KEY].should == @info.event
       end
 
       it('should export the response types') do
-        @info_hash[ RCAP::CAP_1_2::Info::RESPONSE_TYPES_KEY].should == @info.response_types
+        @info_hash[RCAP::CAP_1_2::Info::RESPONSE_TYPES_KEY].should == @info.response_types
       end
 
       it('should export the urgency') do
-        @info_hash[ RCAP::CAP_1_2::Info:: URGENCY_KEY].should == @info.urgency
+        @info_hash[RCAP::CAP_1_2::Info:: URGENCY_KEY].should == @info.urgency
       end
 
       it('should export the severity') do
-        @info_hash[ RCAP::CAP_1_2::Info:: SEVERITY_KEY].should == @info.severity
+        @info_hash[RCAP::CAP_1_2::Info:: SEVERITY_KEY].should == @info.severity
       end
 
       it('should export the certainty') do
-        @info_hash[ RCAP::CAP_1_2::Info:: CERTAINTY_KEY].should == @info.certainty
+        @info_hash[RCAP::CAP_1_2::Info:: CERTAINTY_KEY].should == @info.certainty
       end
 
       it('should export the audience') do
-        @info_hash[ RCAP::CAP_1_2::Info:: AUDIENCE_KEY].should == @info.audience
+        @info_hash[RCAP::CAP_1_2::Info:: AUDIENCE_KEY].should == @info.audience
       end
 
       it('should export the effective date') do
-        @info_hash[ RCAP::CAP_1_2::Info::EFFECTIVE_KEY].should == @info.effective.to_s_for_cap
+        @info_hash[RCAP::CAP_1_2::Info::EFFECTIVE_KEY].should == @info.effective.to_s_for_cap
       end
 
       it('should export the onset date') do
-        @info_hash[ RCAP::CAP_1_2::Info::ONSET_KEY].should == @info.onset.to_s_for_cap
+        @info_hash[RCAP::CAP_1_2::Info::ONSET_KEY].should == @info.onset.to_s_for_cap
       end
 
       it('should export the expires date') do
-        @info_hash[ RCAP::CAP_1_2::Info::EXPIRES_KEY].should == @info.expires.to_s_for_cap
+        @info_hash[RCAP::CAP_1_2::Info::EXPIRES_KEY].should == @info.expires.to_s_for_cap
       end
 
       it('should export the sender name') do
-        @info_hash[ RCAP::CAP_1_2::Info::SENDER_NAME_KEY].should == @info.sender_name
+        @info_hash[RCAP::CAP_1_2::Info::SENDER_NAME_KEY].should == @info.sender_name
       end
 
       it('should export the headline') do
-        @info_hash[ RCAP::CAP_1_2::Info::HEADLINE_KEY].should == @info.headline
+        @info_hash[RCAP::CAP_1_2::Info::HEADLINE_KEY].should == @info.headline
       end
 
       it('should export the description') do
-        @info_hash[ RCAP::CAP_1_2::Info::DESCRIPTION_KEY].should == @info.description
+        @info_hash[RCAP::CAP_1_2::Info::DESCRIPTION_KEY].should == @info.description
       end
 
       it('should export the instruction') do
-        @info_hash[ RCAP::CAP_1_2::Info::INSTRUCTION_KEY].should == @info.instruction
+        @info_hash[RCAP::CAP_1_2::Info::INSTRUCTION_KEY].should == @info.instruction
       end
 
       it('should export the web address ') do
-        @info_hash[ RCAP::CAP_1_2::Info::WEB_KEY].should == @info.web
+        @info_hash[RCAP::CAP_1_2::Info::WEB_KEY].should == @info.web
       end
 
       it('should export the contact') do
-        @info_hash[ RCAP::CAP_1_2::Info::CONTACT_KEY].should == @info.contact
+        @info_hash[RCAP::CAP_1_2::Info::CONTACT_KEY].should == @info.contact
       end
 
       it('should export the event codes') do
-        @info_hash[ RCAP::CAP_1_2::Info::EVENT_CODES_KEY].should == @info.event_codes.map { |event_code| event_code.to_h }
+        @info_hash[RCAP::CAP_1_2::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_2::Info::PARAMETERS_KEY].should == @info.parameters.map { |parameter| parameter.to_h }
+        @info_hash[RCAP::CAP_1_2::Info::PARAMETERS_KEY].should == @info.parameters.map { |parameter| parameter.to_h }
       end
 
       it('should export the resources ') do
-        @info_hash[ RCAP::CAP_1_2::Info::RESOURCES_KEY].should == @info.resources.map { |resource| resource.to_h }
+        @info_hash[RCAP::CAP_1_2::Info::RESOURCES_KEY].should == @info.resources.map { |resource| resource.to_h }
       end
 
       it('should export the areas') do
-        @info_hash[ RCAP::CAP_1_2::Info::AREAS_KEY].should == @info.areas.map { |area| area.to_h }
+        @info_hash[RCAP::CAP_1_2::Info::AREAS_KEY].should == @info.areas.map { |area| area.to_h }
       end
     end
   end

data/spec/cap_1_2/polygon_spec.rb

@@ -83,6 +83,14 @@ describe(RCAP::CAP_1_2::Polygon) do
       @polygon = RCAP::CAP_1_2::Polygon.new(&@polygon_builder)
     end
 
+    context('to geojson') do
+      it('should be valid geojson') do
+        expected = '{"type":"Polygon","coordinates":[[[0,0],[1,1],[2,2],' \
+          '[0,0]]]}'
+        expect(@polygon.to_geojson).to eq expected
+      end
+    end
+
     context('to a hash') do
       it('should export correctly') do
         @polygon.to_h.should == { RCAP::CAP_1_2::Polygon::POINTS_KEY => @polygon.points.map { |point| point.to_a } }

data/spec/cap_1_2/resource_spec.rb

@@ -107,33 +107,33 @@ describe(RCAP::CAP_1_2::Resource) do
       end
 
       it('should set the resource description') do
-        @resource_hash[ RCAP::CAP_1_2::Resource::RESOURCE_DESC_KEY].should == @resource.resource_desc
+        @resource_hash[RCAP::CAP_1_2::Resource::RESOURCE_DESC_KEY].should == @resource.resource_desc
       end
 
       it('should set the mime type') do
-        @resource_hash[ RCAP::CAP_1_2::Resource::MIME_TYPE_KEY].should == @resource.mime_type
+        @resource_hash[RCAP::CAP_1_2::Resource::MIME_TYPE_KEY].should == @resource.mime_type
       end
 
       it('should set the size') do
-        @resource_hash[ RCAP::CAP_1_2::Resource::SIZE_KEY].should == @resource.size
+        @resource_hash[RCAP::CAP_1_2::Resource::SIZE_KEY].should == @resource.size
       end
 
       it('should set the URI') do
-        @resource_hash[ RCAP::CAP_1_2::Resource::URI_KEY].should == @resource.uri
+        @resource_hash[RCAP::CAP_1_2::Resource::URI_KEY].should == @resource.uri
       end
 
       it('should set the dereferenced URI') do
-        @resource_hash[ RCAP::CAP_1_2::Resource::DEREF_URI_KEY].should == @resource.deref_uri
+        @resource_hash[RCAP::CAP_1_2::Resource::DEREF_URI_KEY].should == @resource.deref_uri
       end
 
       it('should set the digest') do
-        @resource_hash[ RCAP::CAP_1_2::Resource::DIGEST_KEY].should == @resource.digest
+        @resource_hash[RCAP::CAP_1_2::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
@@ -169,20 +169,20 @@ describe(RCAP::CAP_1_2::Resource) do
       end
       @content = "1,2\n3,4"
       @encoded_content = Base64.encode64(@content)
-      stub_request(:get, @resource.uri).to_return(status: 200, body: @content)
+      expect(URI).to receive(:parse) { StringIO.new(@content) }
     end
 
     describe('calling dereference_uri!') do
       it('should fetch the content and store it in deref_uri as Base64 encoded content') do
-        lambda { @resource.dereference_uri! }.should(change(@resource, :deref_uri).to(@encoded_content))
+        -> { @resource.dereference_uri! }.should(change(@resource, :deref_uri).to(@encoded_content))
       end
 
       it('should generate the correct SHA1 hash') do
-        lambda { @resource.dereference_uri! }.should(change(@resource, :digest).to(Digest::SHA1.hexdigest(@encoded_content)))
+        -> { @resource.dereference_uri! }.should(change(@resource, :digest).to(Digest::SHA1.hexdigest(@encoded_content)))
       end
 
       it('should set the size in bytes') do
-        lambda { @resource.dereference_uri! }.should(change(@resource, :size).to(@encoded_content.bytesize))
+        -> { @resource.dereference_uri! }.should(change(@resource, :size).to(@encoded_content.bytesize))
       end
     end
   end
@@ -201,11 +201,11 @@ describe(RCAP::CAP_1_2::Resource) do
 
     describe('#calculate_hash_and_size') do
       it('should generate the correct SHA1 hash') do
-        lambda { @resource.calculate_hash_and_size }.should(change(@resource, :digest).to(Digest::SHA1.hexdigest(@encoded_content)))
+        -> { @resource.calculate_hash_and_size }.should(change(@resource, :digest).to(Digest::SHA1.hexdigest(@encoded_content)))
       end
 
       it('should set the size in bytes') do
-        lambda { @resource.calculate_hash_and_size }.should(change(@resource, :size).to(@encoded_content.bytesize))
+        -> { @resource.calculate_hash_and_size }.should(change(@resource, :size).to(@encoded_content.bytesize))
       end
     end