rcap 1.3.1 → 2.0.0

data/spec/cap_1_1/alert_spec.rb

@@ -1,6 +1,31 @@
 require 'spec_helper'
 
 describe( RCAP::CAP_1_1::Alert ) do
+  before( :each ) do
+    @alert_builder = lambda do |alert|
+       alert.sender      = 'Sender'
+       alert.sent        = DateTime.now
+       alert.status      = RCAP::CAP_1_1::Alert::STATUS_TEST
+       alert.scope       = RCAP::CAP_1_1::Alert::SCOPE_PUBLIC
+       alert.source      = 'Source'
+       alert.restriction = 'No Restriction'
+       [ 'Address 1', 'Address 2'].each do |address|
+         alert.addresses << address
+       end
+       [ 'Code1', 'Code2' ].each do |code|
+         alert.codes << code
+       end
+       alert.note        = 'Note'
+       [ 'Reference1', 'Reference2' ].each do |reference|
+         alert.references << reference
+       end
+       [ 'Incident1', 'Incident2' ].each do |incident|
+       end
+       alert.add_info
+       alert.add_info
+    end
+  end
+
   context( 'on initialisation' ) do
     before( :each )  do
       @alert = RCAP::CAP_1_1::Alert.new
@@ -42,18 +67,7 @@ describe( RCAP::CAP_1_1::Alert ) do
 
     context( 'from XML' ) do
       before( :each ) do
-        @original_alert = RCAP::CAP_1_1::Alert.new( :sender      => 'Sender',
-                                                    :sent        => DateTime.now,
-                                                    :status      => RCAP::CAP_1_1::Alert::STATUS_TEST,
-                                                    :scope       => RCAP::CAP_1_1::Alert::SCOPE_PUBLIC,
-                                                    :source      => 'Source',
-                                                    :restriction => 'No Restriction',
-                                                    :addresses   => [ 'Address 1', 'Address 2'],
-                                                    :codes       => [ 'Code1', 'Code2' ],
-                                                    :note        => 'Note',
-                                                    :references  => [ RCAP::CAP_1_1::Alert.new( :sender => 'Sender1' ).to_reference, RCAP::CAP_1_1::Alert.new( :sender => 'Sender2' ).to_reference ],
-                                                    :incidents   => [ 'Incident1', 'Incident2' ],
-                                                    :infos       => [ RCAP::CAP_1_1::Info.new, RCAP::CAP_1_1::Info.new ])
+        @original_alert = RCAP::CAP_1_1::Alert.new( &@alert_builder )
         @xml_string = @original_alert.to_xml
         @xml_document = REXML::Document.new( @xml_string )
         @alert_element = @xml_document.root
@@ -66,18 +80,7 @@ describe( RCAP::CAP_1_1::Alert ) do
 
     context( 'from YAML' ) do
       before( :each ) do
-        @original_alert = RCAP::CAP_1_1::Alert.new( :sender      => 'Sender',
-                                                    :sent        => DateTime.now,
-                                                    :status      => RCAP::CAP_1_1::Alert::STATUS_TEST,
-                                                    :scope       => RCAP::CAP_1_1::Alert::SCOPE_PUBLIC,
-                                                    :source      => 'Source',
-                                                    :restriction => 'No Restriction',
-                                                    :addresses   => [ 'Address 1', 'Address 2'],
-                                                    :codes       => [ 'Code1', 'Code2' ],
-                                                    :note        => 'Note',
-                                                    :references  => [ RCAP::CAP_1_1::Alert.new( :sender => 'Sender1' ).to_reference, RCAP::CAP_1_1::Alert.new( :sender => 'Sender2' ).to_reference ],
-                                                    :incidents   => [ 'Incident1', 'Incident2' ],
-                                                    :infos       => [ RCAP::CAP_1_1::Info.new, RCAP::CAP_1_1::Info.new ])
+        @original_alert = RCAP::CAP_1_1::Alert.new( &@alert_builder )
         @yaml_string = @original_alert.to_yaml
         @alert = RCAP::CAP_1_1::Alert.from_yaml( @yaml_string )
       end
@@ -87,18 +90,7 @@ describe( RCAP::CAP_1_1::Alert ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_alert = RCAP::CAP_1_1::Alert.new( :sender      => 'Sender',
-                                                    :sent        => DateTime.now,
-                                                    :status      => RCAP::CAP_1_1::Alert::STATUS_TEST,
-                                                    :scope       => RCAP::CAP_1_1::Alert::SCOPE_PUBLIC,
-                                                    :source      => 'Source',
-                                                    :restriction => 'No Restriction',
-                                                    :addresses   => [ 'Address 1', 'Address 2'],
-                                                    :codes       => [ 'Code1', 'Code2' ],
-                                                    :note        => 'Note',
-                                                    :references  => [ RCAP::CAP_1_1::Alert.new( :sender => 'Sender1' ).to_reference, RCAP::CAP_1_1::Alert.new( :sender => 'Sender2' ).to_reference ],
-                                                    :incidents   => [ 'Incident1', 'Incident2' ],
-                                                    :infos       => [ RCAP::CAP_1_1::Info.new, RCAP::CAP_1_1::Info.new ])
+        @original_alert = RCAP::CAP_1_1::Alert.new( &@alert_builder )
         @alert = RCAP::CAP_1_1::Alert.from_h( @original_alert.to_h )
       end
 
@@ -107,18 +99,7 @@ describe( RCAP::CAP_1_1::Alert ) do
 
     context( 'from JSON' ) do
       before( :each ) do
-        @original_alert = RCAP::CAP_1_1::Alert.new( :sender      => 'Sender',
-                                                    :sent        => DateTime.now,
-                                                    :status      => RCAP::CAP_1_1::Alert::STATUS_TEST,
-                                                    :scope       => RCAP::CAP_1_1::Alert::SCOPE_PUBLIC,
-                                                    :source      => 'Source',
-                                                    :restriction => 'No Restriction',
-                                                    :addresses   => [ 'Address 1', 'Address 2'],
-                                                    :codes       => [ 'Code1', 'Code2' ],
-                                                    :note        => 'Note',
-                                                    :references  => [ RCAP::CAP_1_1::Alert.new( :sender => 'Sender1' ).to_reference, RCAP::CAP_1_1::Alert.new( :sender => 'Sender2' ).to_reference ],
-                                                    :incidents   => [ 'Incident1', 'Incident2' ],
-                                                    :infos       => [ RCAP::CAP_1_1::Info.new, RCAP::CAP_1_1::Info.new ])
+        @original_alert = RCAP::CAP_1_1::Alert.new( &@alert_builder )
         @alert = RCAP::CAP_1_1::Alert.from_json( @original_alert.to_json )
       end
 
@@ -128,12 +109,14 @@ describe( RCAP::CAP_1_1::Alert ) do
 
   describe( 'is not valid if it' ) do
     before( :each ) do
-      @alert = RCAP::CAP_1_1::Alert.new( :identifier => 'Identifier',
-                                         :sender     => "cap@tempuri.org",
-                                         :sent       => DateTime.now,
-                                         :status     => RCAP::CAP_1_1::Alert::STATUS_TEST,
-                                         :msg_type   => RCAP::CAP_1_1::Alert::MSG_TYPE_ALERT,
-                                         :scope      => RCAP::CAP_1_1::Alert::SCOPE_PUBLIC )
+      @alert = RCAP::CAP_1_1::Alert.new do |alert|
+        alert.identifier = 'Identifier'
+        alert.sender     = "cap@tempuri.org"
+        alert.sent       = DateTime.now
+        alert.status     = RCAP::CAP_1_1::Alert::STATUS_TEST
+        alert.msg_type   = RCAP::CAP_1_1::Alert::MSG_TYPE_ALERT
+        alert.scope      = RCAP::CAP_1_1::Alert::SCOPE_PUBLIC
+      end
       @alert.should( be_valid )
     end
 
@@ -186,11 +169,13 @@ describe( RCAP::CAP_1_1::Alert ) do
 
     context( 'has an info element and it' ) do
       it( 'is not valid' ) do
-        @info = RCAP::CAP_1_1::Info.new( :event => 'Info Event',
-                              :categories => RCAP::CAP_1_1::Info::CATEGORY_GEO,
-                              :urgency => RCAP::CAP_1_1::Info::URGENCY_IMMEDIATE,
-                              :severity => RCAP::CAP_1_1::Info::SEVERITY_EXTREME,
-                              :certainty => RCAP::CAP_1_1::Info::CERTAINTY_OBSERVED )
+        @info = @alert.add_info do |info|
+          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
+          info.certainty  = RCAP::CAP_1_1::Info::CERTAINTY_OBSERVED
+        end
         @info.event = nil
         @alert.infos << @info
         @info.should_not( be_valid )
@@ -206,7 +191,9 @@ describe( RCAP::CAP_1_1::Alert ) do
 
     describe( '#add_info' ) do
       before( :each ) do
-        @info = @alert.add_info( :urgency => 'urgent' )
+        @info = @alert.add_info do |info|
+          info.urgency = 'urgent'
+        end
         @info.urgency.should == 'urgent'
       end
 

data/spec/cap_1_1/area_spec.rb

@@ -1,9 +1,36 @@
 require 'spec_helper'
 
 describe( RCAP::CAP_1_1::Area ) do
+  before( :each ) do
+    @area_builder = lambda do |area|
+      area.area_desc = 'Area Description'
+      area.altitude  = 100
+      area.ceiling   = 200
+
+      area.add_circle do |circle|
+        circle.lattitude = 0
+        circle.longitude = 0
+        circle.radius = 100
+      end
+
+      area.add_geocode do |geocode|
+        geocode.name = 'name'
+        geocode.value = 'value'
+      end
+
+      area.add_polygon.add_point do |point|
+        point.lattitude = 1
+        point.longitude = 2
+      end
+    end
+
+  end
+
   context( 'on initialisation' ) do
     before( :each ) do
       @area = RCAP::CAP_1_1::Area.new
+
+      @original_area = RCAP::CAP_1_1::Area.new( &@area_builder )
     end
 
     # Atomic
@@ -44,14 +71,9 @@ describe( RCAP::CAP_1_1::Area ) do
 
     context( 'from XML' ) do
       before( :each ) do
-        @original_area = RCAP::CAP_1_1::Area.new( :area_desc => 'Area Description',
-                                       :altitude => 100,
-                                       :ceiling => 200,
-                                       :circles => RCAP::CAP_1_1::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 100 ),
-                                       :geocodes => RCAP::CAP_1_1::Geocode.new( :name => 'name', :value => 'value' ),
-                                       :polygons => RCAP::CAP_1_1::Polygon.new( :points => RCAP::CAP_1_1::Point.new( :lattitude =>1, :longitude => 1 )))
-
-        @alert = RCAP::CAP_1_1::Alert.new( :infos => RCAP::CAP_1_1::Info.new( :areas => @original_area ))
+
+        @alert = RCAP::CAP_1_1::Alert.new
+        @alert.add_info.add_area( &@area_builder )
         @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 )
@@ -64,13 +86,6 @@ describe( RCAP::CAP_1_1::Area ) do
 
     context( 'from YAML Data' ) do
       before( :each ) do
-        @original_area = RCAP::CAP_1_1::Area.new( :area_desc => 'Area Description',
-                                                  :altitude => 100,
-                                                  :ceiling => 200,
-                                                  :circles => RCAP::CAP_1_1::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 100 ),
-                                                  :geocodes => RCAP::CAP_1_1::Geocode.new( :name => 'name', :value => 'value' ),
-                                                  :polygons => RCAP::CAP_1_1::Polygon.new( :points => RCAP::CAP_1_1::Point.new( :lattitude =>1, :longitude => 1 )))
-
         @area = RCAP::CAP_1_1::Area.from_yaml_data( YAML.load( @original_area.to_yaml ))
       end
 
@@ -79,13 +94,6 @@ describe( RCAP::CAP_1_1::Area ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_area = RCAP::CAP_1_1::Area.new( :area_desc => 'Area Description',
-                                       :altitude => 100,
-                                       :ceiling => 200,
-                                       :circles => RCAP::CAP_1_1::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 100 ),
-                                       :geocodes => RCAP::CAP_1_1::Geocode.new( :name => 'name', :value => 'value' ),
-                                       :polygons => RCAP::CAP_1_1::Polygon.new( :points => RCAP::CAP_1_1::Point.new( :lattitude =>1, :longitude => 1 )))
-
         @area = RCAP::CAP_1_1::Area.from_h( @original_area.to_h )
       end
 
@@ -95,13 +103,9 @@ describe( RCAP::CAP_1_1::Area ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @area = RCAP::CAP_1_1::Area.new( :area_desc => 'Area Description',
-                             :altitude => 100,
-                             :ceiling => 200,
-                             :circles => RCAP::CAP_1_1::Circle.new(  :lattitude => 0, :longitude => 0 , :radius => 100 ),
-                             :geocodes => RCAP::CAP_1_1::Geocode.new( :name => 'name', :value => 'value' ),
-                             :polygons => RCAP::CAP_1_1::Polygon.new( :points => RCAP::CAP_1_1::Point.new( :lattitude =>1, :longitude => 1 )))
+      @area = RCAP::CAP_1_1::Area.new( &@area_builder )
     end
+
     context( 'to a hash' ) do
       before( :each ) do
         @area_hash = @area.to_h
@@ -120,7 +124,7 @@ describe( RCAP::CAP_1_1::Area ) do
       end
 
       it( 'should export the circles correctly' ) do
-        @area_hash[ RCAP::CAP_1_1::Area::CIRCLES_KEY ].should == @area.circles.map{ |circle| circle.to_h }
+        @area_hash[ RCAP::CAP_1_1::Area::CIRCLES_KEY ].should == @area.circles.map{ |circle| circle.to_a }
       end
 
       it( 'should export the geocodes correctly' ) do
@@ -135,7 +139,10 @@ describe( RCAP::CAP_1_1::Area ) do
 
   context( 'is not valid if' ) do
     before( :each ) do
-      @area = RCAP::CAP_1_1::Area.new( :area_desc => "Cape Town Metropole" )
+      @area = RCAP::CAP_1_1::Area.new do |area|
+        area.area_desc = "Cape Town Metropole"
+      end
+
       @area.should( be_valid )
     end
 
@@ -152,7 +159,11 @@ describe( RCAP::CAP_1_1::Area ) do
 
     context( 'it contains circles and it' ) do
       before( :each ) do
-        @area.circles << RCAP::CAP_1_1::Circle.new( :lattitude => 0, :longitude => 0, :radius => 1)
+        @area.add_circle do |circle|
+          circle.lattitude = 0
+          circle.longitude = 0
+          circle.radius = 1
+        end
         @area.should( be_valid )
       end
 
@@ -164,29 +175,34 @@ describe( RCAP::CAP_1_1::Area ) do
 
     context( 'it contains polygons and it' ) do
       before( :each ) do
-        @polygon = RCAP::CAP_1_1::Polygon.new
-        @polygon.points.push( RCAP::CAP_1_1::Point.new( :lattitude => 0, :longitude => 0 ),
-                             RCAP::CAP_1_1::Point.new( :lattitude => 0, :longitude => 1 ),
-                             RCAP::CAP_1_1::Point.new( :lattitude => 0, :longitude => 0 ))
-        @area.polygons << @polygon
-        @area.should( be_valid )
+        @area.add_polygon do |polygon|
+          [[ 0, 0 ], [ 0, 1 ], [ 0, 0 ]].each do |lattitude, longitude|
+            polygon.add_point do |point|
+              point.lattitude = lattitude
+              point.longitude = longitude
+            end
+          end
+          @area.should( be_valid )
+        end
       end
 
       it( 'has an invalid polygon' ) do
-        @polygon.points.first.lattitude = nil
+        @area.polygons.first.points.first.lattitude = nil
         @area.should_not( be_valid )
       end
     end
 
     context( 'it contains geocodes and it' ) do
       before( :each ) do
-        @geocode = RCAP::CAP_1_1::Geocode.new( :name => 'foo', :value => 'bar' )
-        @area.geocodes << @geocode
+        @area.add_geocode do |geocode|
+          geocode.name = 'foo'
+          geocode.value = 'bar'
+        end
         @area.should( be_valid )
       end
 
       it( 'has an invalid geocode' ) do
-        @geocode.value = nil
+        @area.geocodes.first.value = nil
         @area.should_not( be_valid )
       end
     end
@@ -213,7 +229,11 @@ describe( RCAP::CAP_1_1::Area ) do
 
     describe( '#add_circle' ) do
       before( :each ) do
-        @circle = @area.add_circle( lattitude: 1, longitude: 1, radius: 1 )
+        @circle = @area.add_circle do |circle|
+          circle.lattitude = 1
+          circle.longitude = 1
+          circle.radius = 1
+        end
       end
 
       it( 'should return a CAP 1.1 Circle' ) do
@@ -230,7 +250,10 @@ describe( RCAP::CAP_1_1::Area ) do
 
     describe( '#add_geocode' ) do
       before( :each ) do
-        @geocode = @area.add_geocode( name: 'Geocode', value: '123' )
+        @geocode = @area.add_geocode do |geocode|
+          geocode.name = 'Geocode'
+          geocode.value = '123'
+        end
       end
 
       it( 'should return a CAP 1.1 Geocode' ) do

data/spec/cap_1_1/circle_spec.rb

@@ -3,7 +3,12 @@ require 'spec_helper'
 describe( RCAP::CAP_1_1::Circle ) do
   describe( 'should not be valid if' ) do
     before( :each ) do
-      @circle = RCAP::CAP_1_1::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 1 )
+      @circle = RCAP::CAP_1_1::Circle.new do |circle|
+        circle.lattitude = 0
+        circle.longitude = 0
+        circle.radius = 0
+      end
+
       @circle.should( be_valid )
     end
 
@@ -36,9 +41,19 @@ describe( RCAP::CAP_1_1::Circle ) do
   context( 'on initialisation' ) do
     context( 'from XML' ) do
       before( :each ) do
-        @original_circle = RCAP::CAP_1_1::Circle.new( :radius => 10.5,
-                                             :lattitude => 30, :longitude => 60 )
-        @alert = RCAP::CAP_1_1::Alert.new( :infos => RCAP::CAP_1_1::Info.new( :areas => RCAP::CAP_1_1::Area.new( :circles => @original_circle )))
+        @original_circle = RCAP::CAP_1_1::Circle.new do |circle|
+          circle.lattitude = 30
+          circle.longitude = 60
+          circle.radius    = 10.5
+        end
+
+        @alert = RCAP::CAP_1_1::Alert.new
+        @alert.add_info.add_area.add_circle do |circle|
+          circle.lattitude = 30
+          circle.longitude = 60
+          circle.radius    = 10.5
+        end
+
         @xml_string = @alert.to_xml
         @xml_document = REXML::Document.new( @xml_string )
         @info_element = RCAP.xpath_first( @xml_document.root, RCAP::CAP_1_1::Info::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
@@ -59,7 +74,11 @@ describe( RCAP::CAP_1_1::Circle ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_circle = RCAP::CAP_1_1::Circle.new( :radius => 10.5, :lattitude => 30, :longitude => 60 )
+        @original_circle = RCAP::CAP_1_1::Circle.new do |circle|
+          circle.lattitude = 30
+          circle.longitude = 60
+          circle.radius    = 10.5
+        end
         @circle = RCAP::CAP_1_1::Circle.from_h( @original_circle.to_h )
       end
 
@@ -76,7 +95,11 @@ describe( RCAP::CAP_1_1::Circle ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @circle = RCAP::CAP_1_1::Circle.new( :radius => 10.5, :lattitude => 30, :longitude => 60 )
+      @circle = RCAP::CAP_1_1::Circle.new do |circle|
+        circle.lattitude = 30
+        circle.longitude = 60
+        circle.radius    = 10.5
+      end
     end
 
     context( 'to hash' ) do

data/spec/cap_1_1/event_code_spec.rb

@@ -4,8 +4,13 @@ describe( RCAP::CAP_1_1::EventCode ) do
   context( 'when initialised' ) do
     context( 'from XML' ) do
       before( :each ) do
-        @original_event_code = RCAP::CAP_1_1::EventCode.new( :name => 'name', :value => 'value' )
-        @alert = RCAP::CAP_1_1::Alert.new( :infos => RCAP::CAP_1_1::Info.new( :event_codes => @original_event_code ))
+        @alert = RCAP::CAP_1_1::Alert.new do |alert|
+          alert.add_info.add_event_code do |event_code|
+            event_code.name = 'name'
+            event_code.value = 'value'
+          end
+        end
+        @original_event_code = @alert.infos.first.event_codes.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 )
@@ -29,7 +34,10 @@ describe( RCAP::CAP_1_1::EventCode ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @event_code = RCAP::CAP_1_1::EventCode.new( :name => 'name', :value => 'value' )
+      @event_code = RCAP::CAP_1_1::EventCode.new do |event_code|
+        event_code.name = 'name'
+        event_code.value = 'value'
+      end
     end
 
     context( 'to a hash' ) do

data/spec/cap_1_1/geocode_spec.rb

@@ -4,8 +4,13 @@ describe( RCAP::CAP_1_1::Geocode ) do
   context( 'when initialised' ) do
     context( 'from XML' ) do
       before( :each ) do
-        @original_geocode = RCAP::CAP_1_1::Geocode.new( :name => 'name', :value => 'value' )
-        @alert = RCAP::CAP_1_1::Alert.new( :infos => RCAP::CAP_1_1::Info.new( :areas => RCAP::CAP_1_1::Area.new( :geocodes => @original_geocode )))
+        @alert = RCAP::CAP_1_1::Alert.new do |alert|
+          alert.add_info.add_area.add_geocode do |geocode|
+            geocode.name = 'name'
+            geocode.value = 'value'
+          end
+        end
+        @original_geocode = @alert.infos.first.areas.first.geocodes.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 )
@@ -30,7 +35,10 @@ describe( RCAP::CAP_1_1::Geocode ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @geocode = RCAP::CAP_1_1::Geocode.new( :name => 'name', :value => 'value' )
+      @geocode = RCAP::CAP_1_1::Geocode.new do |geocode|
+        geocode.name = 'name'
+        geocode.value = 'value'
+      end
     end
 
     context( 'to a hash' ) do