rcap 1.3.1 → 2.0.0

data/lib/rcap.rb

@@ -9,15 +9,30 @@ require 'rexml/formatters/pretty'
 require 'open-uri'
 require 'base64'
 require 'digest/sha1'
+
 # Extensions
-require 'extensions/array'
-require 'extensions/string'
-require 'extensions/date_time'
-require 'extensions/time'
+require 'rcap/extensions/array'
+require 'rcap/extensions/string'
+require 'rcap/extensions/date_time'
+require 'rcap/extensions/time'
+require 'rcap/extensions/date'
+
 # RCAP
 require 'rcap/version'
 require 'rcap/utilities'
 require 'rcap/validations'
+# Base
+require 'rcap/base/parameter'
+require 'rcap/base/point'
+require 'rcap/base/circle'
+require 'rcap/base/event_code'
+require 'rcap/base/geocode'
+require 'rcap/base/polygon'
+require 'rcap/base/area'
+require 'rcap/base/resource'
+require 'rcap/base/info'
+require 'rcap/base/alert'
+# 1.0
 require 'rcap/cap_1_0/alert'
 require 'rcap/cap_1_0/parameter'
 require 'rcap/cap_1_0/event_code'
@@ -28,6 +43,7 @@ require 'rcap/cap_1_0/circle'
 require 'rcap/cap_1_0/polygon'
 require 'rcap/cap_1_0/geocode'
 require 'rcap/cap_1_0/area'
+# 1.1
 require 'rcap/cap_1_1/alert'
 require 'rcap/cap_1_1/parameter'
 require 'rcap/cap_1_1/event_code'
@@ -38,6 +54,7 @@ require 'rcap/cap_1_1/circle'
 require 'rcap/cap_1_1/polygon'
 require 'rcap/cap_1_1/geocode'
 require 'rcap/cap_1_1/area'
+# 1.2
 require 'rcap/cap_1_2/alert'
 require 'rcap/cap_1_2/parameter'
 require 'rcap/cap_1_2/event_code'

data/spec/alert_spec.rb

@@ -1,20 +1,32 @@
+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( :sender => 'Sender',
-                                                    :sent => DateTime.now,
-                                                    :status => RCAP::CAP_1_0::Alert::STATUS_TEST,
-                                                    :scope => RCAP::CAP_1_0::Alert::SCOPE_PUBLIC,
-                                                    :source => 'Source',
-                                                    :restriction => 'No Restriction',
-                                                    :addresses => [ 'Address 1', 'Address 2'],
-                                                    :code => ['Code1', 'Code2'],
-                                                    :note => 'Note',
-                                                    :references => [ "1.0,1", "1.0,2" ],
-                                                    :incidents => [ 'Incident1', 'Incident2' ],
-                                                    :infos => [ RCAP::CAP_1_0::Info.new, RCAP::CAP_1_0::Info.new ])
+        @original_alert = RCAP::CAP_1_0::Alert.new do |alert|
+          alert.sender      = 'Sender'
+          alert.sent        = DateTime.now
+          alert.status      = RCAP::CAP_1_0::Alert::STATUS_TEST
+          alert.scope       = RCAP::CAP_1_0::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'
+          [ "1.0,1", "1.0,2" ].each do |reference|
+            alert.references << reference
+          end
+          [ 'Incident1', 'Incident2' ].each do |incident|
+            alert.incidents << incident
+          end
+          2.times{ alert.add_info }
+        end
       end
 
       shared_examples_for( 'it has parsed a CAP 1.0 alert correctly' ) do
@@ -65,18 +77,28 @@ describe( RCAP::Alert ) do
 
     context( 'a CAP 1.1 alert' ) 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'],
-                                                    :code => ['Code1', 'Code2'],
-                                                    :note => 'Note',
-                                                    :references => [ "1,1,1", "1,1,2" ],
-                                                    :incidents => [ 'Incident1', 'Incident2' ],
-                                                    :infos => [ RCAP::CAP_1_1::Info.new, RCAP::CAP_1_1::Info.new ])
+        @original_alert = RCAP::CAP_1_1::Alert.new 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'
+          [ "1,1,1", "1,1,2" ].each do |reference|
+            alert.references << reference
+          end
+          [ 'Incident1', 'Incident2' ].each do |incident|
+            alert.incidents << incident
+          end
+          2.times{ alert.add_info }
+        end
       end
 
       shared_examples_for( 'it has parsed a CAP 1.1 alert correctly' ) do
@@ -127,18 +149,28 @@ describe( RCAP::Alert ) do
 
     context( 'a CAP 1.2 alert' ) do
       before( :each ) do
-        @original_alert = RCAP::CAP_1_2::Alert.new( :sender => 'Sender',
-                                                    :sent => DateTime.now,
-                                                    :status => RCAP::CAP_1_2::Alert::STATUS_TEST,
-                                                    :scope => RCAP::CAP_1_2::Alert::SCOPE_PUBLIC,
-                                                    :source => 'Source',
-                                                    :restriction => 'No Restriction',
-                                                    :addresses => [ 'Address 1', 'Address 2'],
-                                                    :codes => [ 'Code1', 'Code2'],
-                                                    :note => 'Note',
-                                                    :references => [ "1,1,1", "1,1,2" ],
-                                                    :incidents => [ 'Incident1', 'Incident2' ],
-                                                    :infos => [ RCAP::CAP_1_2::Info.new, RCAP::CAP_1_2::Info.new ])
+        @original_alert = RCAP::CAP_1_2::Alert.new do |alert|
+          alert.sender      = 'Sender'
+          alert.sent        = DateTime.now
+          alert.status      = RCAP::CAP_1_2::Alert::STATUS_TEST
+          alert.scope       = RCAP::CAP_1_2::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'
+          [ "1,1,1", "1,1,2" ].each do |reference|
+            alert.references << reference
+          end
+          [ 'Incident1', 'Incident2' ].each do |incident|
+            alert.incidents << incident
+          end
+          2.times{ alert.add_info }
+        end
       end
 
       shared_examples_for( 'it has parsed a CAP 1.2 alert correctly' ) do
@@ -189,7 +221,7 @@ describe( RCAP::Alert ) do
   end
 
   describe( 'external file' ) do
-    def load_file( file_name ) 
+    def load_file( file_name )
       File.open( File.join( File.dirname( __FILE__ ), 'assets', file_name )){|f| f.read }
     end
 

data/spec/cap_1_0/alert_spec.rb

@@ -4,6 +4,32 @@ describe( RCAP::CAP_1_0::Alert ) do
   context( 'on initialisation' ) do
     before( :each )  do
       @alert = RCAP::CAP_1_0::Alert.new
+
+      @original_alert = RCAP::CAP_1_0::Alert.new do |alert|
+        alert.sender      = 'Sender'
+        alert.sent        = DateTime.now
+        alert.status      = RCAP::CAP_1_0::Alert::STATUS_TEST
+        alert.scope       = RCAP::CAP_1_0::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'
+        [ 'Sender1','Sender2' ].each do |sender|
+          a = RCAP::CAP_1_0::Alert.new do |a|
+            a.sender = sender
+          end
+          alert.references << a.to_reference
+        end
+        [ 'Incident1', 'Incident2' ].each do |incident|
+          alert.incidents << incident
+        end
+        2.times{ alert.add_info }
+      end
     end
 
     it( 'should have a identifier' ){ @alert.identifier.should_not( be_nil )}
@@ -42,18 +68,6 @@ describe( RCAP::CAP_1_0::Alert ) do
 
     context( 'from XML' ) do
       before( :each ) do
-        @original_alert = RCAP::CAP_1_0::Alert.new( :sender      => 'Sender',
-                                                    :sent        => DateTime.now,
-                                                    :status      => RCAP::CAP_1_0::Alert::STATUS_TEST,
-                                                    :scope       => RCAP::CAP_1_0::Alert::SCOPE_PUBLIC,
-                                                    :source      => 'Source',
-                                                    :restriction => 'No Restriction',
-                                                    :addresses   => [ 'Address 1', 'Address 2'],
-                                                    :codes       => [ 'Code1', 'Code2' ],
-                                                    :note        => 'Note',
-                                                    :references  => [ RCAP::CAP_1_0::Alert.new( :sender => 'Sender1' ).to_reference, RCAP::CAP_1_0::Alert.new( :sender => 'Sender2' ).to_reference ],
-                                                    :incidents   => [ 'Incident1', 'Incident2' ],
-                                                    :infos       => [ RCAP::CAP_1_0::Info.new, RCAP::CAP_1_0::Info.new ])
         @xml_string = @original_alert.to_xml
         @xml_document = REXML::Document.new( @xml_string )
         @alert_element = @xml_document.root
@@ -66,18 +80,6 @@ describe( RCAP::CAP_1_0::Alert ) do
 
     context( 'from YAML' ) do
       before( :each ) do
-        @original_alert = RCAP::CAP_1_0::Alert.new( :sender      => 'Sender',
-                                                    :sent        => DateTime.now,
-                                                    :status      => RCAP::CAP_1_0::Alert::STATUS_TEST,
-                                                    :scope       => RCAP::CAP_1_0::Alert::SCOPE_PUBLIC,
-                                                    :source      => 'Source',
-                                                    :restriction => 'No Restriction',
-                                                    :addresses   => [ 'Address 1', 'Address 2'],
-                                                    :codes       => [ 'Code1', 'Code2' ],
-                                                    :note        => 'Note',
-                                                    :references  => [ RCAP::CAP_1_0::Alert.new( :sender => 'Sender1' ).to_reference, RCAP::CAP_1_0::Alert.new( :sender => 'Sender2' ).to_reference ],
-                                                    :incidents   => [ 'Incident1', 'Incident2' ],
-                                                    :infos       => [ RCAP::CAP_1_0::Info.new, RCAP::CAP_1_0::Info.new ])
         @yaml_string = @original_alert.to_yaml
         @alert = RCAP::CAP_1_0::Alert.from_yaml( @yaml_string )
       end
@@ -87,18 +89,6 @@ describe( RCAP::CAP_1_0::Alert ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_alert = RCAP::CAP_1_0::Alert.new( :sender      => 'Sender',
-                                                    :sent        => DateTime.now,
-                                                    :status      => RCAP::CAP_1_0::Alert::STATUS_TEST,
-                                                    :scope       => RCAP::CAP_1_0::Alert::SCOPE_PUBLIC,
-                                                    :source      => 'Source',
-                                                    :restriction => 'No Restriction',
-                                                    :addresses   => [ 'Address 1', 'Address 2'],
-                                                    :codes       => [ 'Code1', 'Code2' ],
-                                                    :note        => 'Note',
-                                                    :references  => [ RCAP::CAP_1_0::Alert.new( :sender => 'Sender1' ).to_reference, RCAP::CAP_1_0::Alert.new( :sender => 'Sender2' ).to_reference ],
-                                                    :incidents   => [ 'Incident1', 'Incident2' ],
-                                                    :infos       => [ RCAP::CAP_1_0::Info.new, RCAP::CAP_1_0::Info.new ])
         @alert = RCAP::CAP_1_0::Alert.from_h( @original_alert.to_h )
       end
 
@@ -107,18 +97,6 @@ describe( RCAP::CAP_1_0::Alert ) do
 
     context( 'from JSON' ) do
       before( :each ) do
-        @original_alert = RCAP::CAP_1_0::Alert.new( :sender      => 'Sender',
-                                                    :sent        => DateTime.now,
-                                                    :status      => RCAP::CAP_1_0::Alert::STATUS_TEST,
-                                                    :scope       => RCAP::CAP_1_0::Alert::SCOPE_PUBLIC,
-                                                    :source      => 'Source',
-                                                    :restriction => 'No Restriction',
-                                                    :addresses   => [ 'Address 1', 'Address 2'],
-                                                    :codes       => [ 'Code1', 'Code2' ],
-                                                    :note        => 'Note',
-                                                    :references  => [ RCAP::CAP_1_0::Alert.new( :sender => 'Sender1' ).to_reference, RCAP::CAP_1_0::Alert.new( :sender => 'Sender2' ).to_reference ],
-                                                    :incidents   => [ 'Incident1', 'Incident2' ],
-                                                    :infos       => [ RCAP::CAP_1_0::Info.new, RCAP::CAP_1_0::Info.new ])
         @alert = RCAP::CAP_1_0::Alert.from_json( @original_alert.to_json )
       end
 
@@ -128,12 +106,14 @@ describe( RCAP::CAP_1_0::Alert ) do
 
   describe( 'is not valid if it' ) do
     before( :each ) do
-      @alert = RCAP::CAP_1_0::Alert.new( :identifier => 'Identifier',
-                                         :sender     => "cap@tempuri.org",
-                                         :sent       => DateTime.now,
-                                         :status     => RCAP::CAP_1_0::Alert::STATUS_TEST,
-                                         :msg_type   => RCAP::CAP_1_0::Alert::MSG_TYPE_ALERT,
-                                         :scope      => RCAP::CAP_1_0::Alert::SCOPE_PUBLIC )
+      @alert = RCAP::CAP_1_0::Alert.new do |alert|
+         alert.identifier = 'Identifier'
+         alert.sender     = "cap@tempuri.org"
+         alert.sent       = DateTime.now
+         alert.status     = RCAP::CAP_1_0::Alert::STATUS_TEST
+         alert.msg_type   = RCAP::CAP_1_0::Alert::MSG_TYPE_ALERT
+         alert.scope      = RCAP::CAP_1_0::Alert::SCOPE_PUBLIC
+      end
       @alert.should( be_valid )
     end
 
@@ -186,13 +166,15 @@ describe( RCAP::CAP_1_0::Alert ) do
 
     context( 'has an info element and it' ) do
       it( 'is not valid' ) do
-        @info = RCAP::CAP_1_0::Info.new( :event => 'Info Event',
-                              :categories => RCAP::CAP_1_0::Info::CATEGORY_GEO,
-                              :urgency => RCAP::CAP_1_0::Info::URGENCY_IMMEDIATE,
-                              :severity => RCAP::CAP_1_0::Info::SEVERITY_EXTREME,
-                              :certainty => RCAP::CAP_1_0::Info::CERTAINTY_VERY_LIKELY )
+        @info = @alert.add_info do |info|
+          info.event     = 'Info Event'
+          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
+        end
+        @info.categories << RCAP::CAP_1_0::Info::CATEGORY_GEO
         @info.event = nil
-        @alert.infos << @info
+
         @info.should_not( be_valid )
         @alert.should_not( be_valid )
       end
@@ -206,7 +188,10 @@ describe( RCAP::CAP_1_0::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_0/area_spec.rb

@@ -4,6 +4,28 @@ describe( RCAP::CAP_1_0::Area ) do
   context( 'on initialisation' ) do
     before( :each ) do
       @area = RCAP::CAP_1_0::Area.new
+
+      @original_area = RCAP::CAP_1_0::Area.new 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
 
     # Atomic
@@ -44,14 +66,9 @@ describe( RCAP::CAP_1_0::Area ) do
 
     context( 'from XML' ) do
       before( :each ) do
-        @original_area = RCAP::CAP_1_0::Area.new( :area_desc => 'Area Description',
-                                       :altitude => 100,
-                                       :ceiling => 200,
-                                       :circles => RCAP::CAP_1_0::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 100 ),
-                                       :geocodes => RCAP::CAP_1_0::Geocode.new( :name => 'name', :value => 'value' ),
-                                       :polygons => RCAP::CAP_1_0::Polygon.new( :points => RCAP::CAP_1_0::Point.new( :lattitude =>1, :longitude => 1 )))
-
-        @alert = RCAP::CAP_1_0::Alert.new( :infos => RCAP::CAP_1_0::Info.new( :areas => @original_area ))
+
+        @alert = RCAP::CAP_1_0::Alert.new
+        @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 )
@@ -64,12 +81,6 @@ describe( RCAP::CAP_1_0::Area ) do
 
     context( 'from YAML Data' ) do
       before( :each ) do
-        @original_area = RCAP::CAP_1_0::Area.new( :area_desc => 'Area Description',
-                                                  :altitude => 100,
-                                                  :ceiling => 200,
-                                                  :circles => RCAP::CAP_1_0::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 100 ),
-                                                  :geocodes => RCAP::CAP_1_0::Geocode.new( :name => 'name', :value => 'value' ),
-                                                  :polygons => RCAP::CAP_1_0::Polygon.new( :points => RCAP::CAP_1_0::Point.new( :lattitude =>1, :longitude => 1 )))
 
         @area = RCAP::CAP_1_0::Area.from_yaml_data( YAML.load( @original_area.to_yaml ))
       end
@@ -79,12 +90,6 @@ describe( RCAP::CAP_1_0::Area ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_area = RCAP::CAP_1_0::Area.new( :area_desc => 'Area Description',
-                                       :altitude => 100,
-                                       :ceiling => 200,
-                                       :circles => RCAP::CAP_1_0::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 100 ),
-                                       :geocodes => RCAP::CAP_1_0::Geocode.new( :name => 'name', :value => 'value' ),
-                                       :polygons => RCAP::CAP_1_0::Polygon.new( :points => RCAP::CAP_1_0::Point.new( :lattitude =>1, :longitude => 1 )))
 
         @area = RCAP::CAP_1_0::Area.from_h( @original_area.to_h )
       end
@@ -95,13 +100,29 @@ describe( RCAP::CAP_1_0::Area ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @area = RCAP::CAP_1_0::Area.new( :area_desc => 'Area Description',
-                             :altitude => 100,
-                             :ceiling => 200,
-                             :circles => RCAP::CAP_1_0::Circle.new(  :lattitude => 0, :longitude => 0 , :radius => 100 ),
-                             :geocodes => RCAP::CAP_1_0::Geocode.new( :name => 'name', :value => 'value' ),
-                             :polygons => RCAP::CAP_1_0::Polygon.new( :points => RCAP::CAP_1_0::Point.new( :lattitude =>1, :longitude => 1 )))
+      @area = RCAP::CAP_1_0::Area.new 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 = 1
+        end
+      end
     end
+
     context( 'to a hash' ) do
       before( :each ) do
         @area_hash = @area.to_h
@@ -120,7 +141,7 @@ describe( RCAP::CAP_1_0::Area ) do
       end
 
       it( 'should export the circles correctly' ) do
-        @area_hash[ RCAP::CAP_1_0::Area::CIRCLES_KEY ].should == @area.circles.map{ |circle| circle.to_h }
+        @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
@@ -135,7 +156,9 @@ describe( RCAP::CAP_1_0::Area ) do
 
   context( 'is not valid if' ) do
     before( :each ) do
-      @area = RCAP::CAP_1_0::Area.new( :area_desc => "Cape Town Metropole" )
+      @area = RCAP::CAP_1_0::Area.new do |area|
+        area.area_desc = "Cape Town Metropole"
+      end
       @area.should( be_valid )
     end
 
@@ -152,7 +175,11 @@ describe( RCAP::CAP_1_0::Area ) do
 
     context( 'it contains circles and it' ) do
       before( :each ) do
-        @area.circles << RCAP::CAP_1_0::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
 
@@ -165,9 +192,13 @@ describe( RCAP::CAP_1_0::Area ) do
     context( 'it contains polygons and it' ) do
       before( :each ) do
         @polygon = RCAP::CAP_1_0::Polygon.new
-        @polygon.points.push( RCAP::CAP_1_0::Point.new( :lattitude => 0, :longitude => 0 ),
-                             RCAP::CAP_1_0::Point.new( :lattitude => 0, :longitude => 1 ),
-                             RCAP::CAP_1_0::Point.new( :lattitude => 0, :longitude => 0 ))
+        [[ 0, 0], [ 0, 1 ], [ 0, 0 ]].each do |lattitude, longitude|
+          @polygon.add_point do |point|
+            point.lattitude = lattitude
+            point.longitude = longitude
+          end
+        end
+
         @area.polygons << @polygon
         @area.should( be_valid )
       end
@@ -180,13 +211,15 @@ describe( RCAP::CAP_1_0::Area ) do
 
     context( 'it contains geocodes and it' ) do
       before( :each ) do
-        @geocode = RCAP::CAP_1_0::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 +246,11 @@ describe( RCAP::CAP_1_0::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.0 Circle' ) do
@@ -230,7 +267,10 @@ describe( RCAP::CAP_1_0::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.0 Geocode' ) do

data/spec/cap_1_0/circle_spec.rb

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

data/spec/cap_1_0/event_code_spec.rb

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