rcap 1.3.1 → 2.0.0

data/spec/cap_1_1/resource_spec.rb

@@ -15,15 +15,16 @@ describe( RCAP::CAP_1_1::Resource ) do
 
     context( 'from XML' ) do
       before( :each ) do
-        @original_resource = RCAP::CAP_1_1::Resource.new
-        @original_resource.resource_desc = "Image of incident"
-        @original_resource.uri           = "http://capetown.gov.za/cap/resources/image.png"
-        @original_resource.mime_type     = 'image/png'
-        @original_resource.deref_uri     = "IMAGE DATA"
-        @original_resource.size          = 20480
-        @original_resource.digest        = "2048"
-
-        @alert = RCAP::CAP_1_1::Alert.new( :infos => RCAP::CAP_1_1::Info.new( :resources => @original_resource ))
+        @alert = RCAP::CAP_1_1::Alert.new
+        @alert.add_info.add_resource do |resource|
+          resource.resource_desc = "Image of incident"
+          resource.uri           = "http://capetown.gov.za/cap/resources/image.png"
+          resource.mime_type     = 'image/png'
+          resource.deref_uri     = "IMAGE DATA"
+          resource.size          = 20480
+          resource.digest        = "2048"
+        end
+        @original_resource = @alert.infos.first.resources.first
         @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 )
@@ -60,13 +61,14 @@ describe( RCAP::CAP_1_1::Resource ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_resource = RCAP::CAP_1_1::Resource.new
-        @original_resource.resource_desc = "Image of incident"
-        @original_resource.uri           = "http://capetown.gov.za/cap/resources/image.png"
-        @original_resource.mime_type     = 'image/png'
-        @original_resource.deref_uri     = "IMAGE DATA"
-        @original_resource.size          = 20480
-        @original_resource.digest        = "2048"
+        @original_resource = RCAP::CAP_1_1::Resource.new do |resource|
+          resource.resource_desc = "Image of incident"
+          resource.uri           = "http://capetown.gov.za/cap/resources/image.png"
+          resource.mime_type     = 'image/png'
+          resource.deref_uri     = "IMAGE DATA"
+          resource.size          = 20480
+          resource.digest        = "2048"
+        end
 
         @resource = RCAP::CAP_1_1::Resource.from_h( @original_resource.to_h )
       end
@@ -96,6 +98,43 @@ describe( RCAP::CAP_1_1::Resource ) do
       end
     end
 
+    context( 'from YAML' ) do
+      before( :each ) do
+        @original_resource = RCAP::CAP_1_1::Resource.new do |resource|
+          resource.resource_desc = "Image of incident"
+          resource.uri           = "http://capetown.gov.za/cap/resources/image.png"
+          resource.mime_type     = 'image/png'
+          resource.deref_uri     = "IMAGE DATA"
+          resource.size          = 20480
+          resource.digest        = "2048"
+        end
+        @resource = RCAP::CAP_1_1::Resource.from_yaml_data( YAML.load( @original_resource.to_yaml ))
+      end
+
+      it( 'should parse resource_desc correctly' ) do
+        @resource.resource_desc.should == @original_resource.resource_desc
+      end
+
+      it( 'should parse uri correctly' ) do
+        @resource.uri.should == @original_resource.uri
+      end
+
+      it( 'should parse mime_type correctly' ) do
+        @resource.mime_type.should == @original_resource.mime_type
+      end
+
+      it( 'should parse deref_uri correctly' ) do
+        @resource.deref_uri.should == @original_resource.deref_uri
+      end
+
+      it( 'should parse size correctly' ) do
+        @resource.size.should == @original_resource.size
+      end
+
+      it( 'should parse digest correctly' ) do
+        @resource.digest.should == @original_resource.digest
+      end
+    end
   end
 
   context( 'when exported' ) do
@@ -148,7 +187,9 @@ describe( RCAP::CAP_1_1::Resource ) do
 
   context( 'which is valid' ) do
     before( :each ) do
-      @resource = RCAP::CAP_1_1::Resource.new( :resource_desc => 'Resource Description' )
+      @resource = RCAP::CAP_1_1::Resource.new do |resource|
+        resource.resource_desc = 'Resource Description'
+      end
       @resource.should( be_valid )
     end
 
@@ -162,7 +203,11 @@ describe( RCAP::CAP_1_1::Resource ) do
 
   context( 'with a non-rereferenced URI' ) do
     before( :each ) do
-      @resource = RCAP::CAP_1_1::Resource.new( :resource_desc => 'Resource Description', :mime_type => 'text/csv', :uri => 'http://tempuri.org/resource.csv' )
+      @resource = RCAP::CAP_1_1::Resource.new do |resource|
+        resource.resource_desc = 'Resource Description'
+        resource.mime_type     = 'text/csv'
+        resource.uri           = 'http://tempuri.org/resource.csv'
+      end
       @content = "1,2\n3,4"
       @encoded_content = Base64.encode64( @content )
       stub_request( :get, @resource.uri ).to_return( :status => 200, :body => @content )
@@ -184,10 +229,15 @@ describe( RCAP::CAP_1_1::Resource ) do
   end
 
   context( 'with a dereferenced URI' ) do
-    before( :each ) do 
+    before( :each ) do
       @content = "1,2\n3,4"
       @encoded_content = Base64.encode64( @content )
-      @resource = RCAP::CAP_1_1::Resource.new( :resource_desc => 'Resource Description', :mime_type => 'text/csv', :uri => 'http://tempuri.org/resource.csv', :deref_uri => @encoded_content )
+      @resource = RCAP::CAP_1_1::Resource.new do |resource|
+        resource.resource_desc = 'Resource Description'
+        resource.mime_type     = 'text/csv'
+        resource.uri           = 'http://tempuri.org/resource.csv'
+        resource.deref_uri     = @encoded_content
+      end
     end
 
     describe( '#calculate_hash_and_size' ) do

data/spec/cap_1_2/alert_spec.rb

@@ -1,6 +1,33 @@
 require 'spec_helper'
 
 describe( RCAP::CAP_1_2::Alert ) do
+  before( :each ) do
+    @alert_builder = lambda 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'
+      [ 'Reference1', 'Reference2' ].each do |reference|
+        alert.references << reference
+      end
+      [ 'Incident1', 'Incident2' ].each do |incident|
+        alert.incidents << incident
+      end
+      2.times do
+        alert.add_info
+      end
+    end
+  end
+
   context( 'on initialisation' ) do
     before( :each )  do
       @alert = RCAP::CAP_1_2::Alert.new
@@ -42,18 +69,7 @@ describe( RCAP::CAP_1_2::Alert ) do
 
     context( 'from XML' ) 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  => [ RCAP::CAP_1_2::Alert.new( :sender => 'Sender1' ).to_reference, RCAP::CAP_1_2::Alert.new( :sender => 'Sender2' ).to_reference ],
-                                                    :incidents   => [ 'Incident1', 'Incident2' ],
-                                                    :infos       => [ RCAP::CAP_1_2::Info.new, RCAP::CAP_1_2::Info.new ])
+        @original_alert = RCAP::CAP_1_2::Alert.new( &@alert_builder )
         @xml_string = @original_alert.to_xml
         @xml_document = REXML::Document.new( @xml_string )
         @alert_element = @xml_document.root
@@ -66,18 +82,7 @@ describe( RCAP::CAP_1_2::Alert ) do
 
     context( 'from YAML' ) 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  => [ RCAP::CAP_1_2::Alert.new( :sender => 'Sender1' ).to_reference, RCAP::CAP_1_2::Alert.new( :sender => 'Sender2' ).to_reference ],
-                                                    :incidents   => [ 'Incident1', 'Incident2' ],
-                                                    :infos       => [ RCAP::CAP_1_2::Info.new, RCAP::CAP_1_2::Info.new ])
+        @original_alert = RCAP::CAP_1_2::Alert.new( &@alert_builder )
         @yaml_string = @original_alert.to_yaml
         @alert = RCAP::CAP_1_2::Alert.from_yaml( @yaml_string )
       end
@@ -87,18 +92,7 @@ describe( RCAP::CAP_1_2::Alert ) do
 
     context( 'from a hash' ) 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  => [ RCAP::CAP_1_2::Alert.new( :sender => 'Sender1' ).to_reference, RCAP::CAP_1_2::Alert.new( :sender => 'Sender2' ).to_reference ],
-                                                    :incidents   => [ 'Incident1', 'Incident2' ],
-                                                    :infos       => [ RCAP::CAP_1_2::Info.new, RCAP::CAP_1_2::Info.new ])
+        @original_alert = RCAP::CAP_1_2::Alert.new( &@alert_builder )
         @alert = RCAP::CAP_1_2::Alert.from_h( @original_alert.to_h )
       end
 
@@ -107,18 +101,7 @@ describe( RCAP::CAP_1_2::Alert ) do
 
     context( 'from JSON' ) 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  => [ RCAP::CAP_1_2::Alert.new( :sender => 'Sender1' ).to_reference, RCAP::CAP_1_2::Alert.new( :sender => 'Sender2' ).to_reference ],
-                                                    :incidents   => [ 'Incident1', 'Incident2' ],
-                                                    :infos       => [ RCAP::CAP_1_2::Info.new, RCAP::CAP_1_2::Info.new ])
+        @original_alert = RCAP::CAP_1_2::Alert.new( &@alert_builder )
         @alert = RCAP::CAP_1_2::Alert.from_json( @original_alert.to_json )
       end
 
@@ -128,80 +111,82 @@ describe( RCAP::CAP_1_2::Alert ) do
 
   describe( 'is not valid if it' ) do
     before( :each ) do
-      @alert = RCAP::CAP_1_2::Alert.new( :identifier => 'Identifier',
-                                         :sender     => "cap@tempuri.org",
-                                         :sent       => DateTime.now,
-                                         :status     => RCAP::CAP_1_2::Alert::STATUS_TEST,
-                                         :msg_type   => RCAP::CAP_1_2::Alert::MSG_TYPE_ALERT,
-                                         :scope      => RCAP::CAP_1_2::Alert::SCOPE_PUBLIC )
-      @alert.should( be_valid )
-    end
+      @alert = RCAP::CAP_1_2::Alert.new do |alert|
+        alert.identifier = 'Identifier'
+        alert.sender     = "cap@tempuri.org"
+        alert.sent       = DateTime.now
+        alert.status     = RCAP::CAP_1_2::Alert::STATUS_TEST
+        alert.msg_type   = RCAP::CAP_1_2::Alert::MSG_TYPE_ALERT
+        alert.scope      = RCAP::CAP_1_2::Alert::SCOPE_PUBLIC
+        @alert.should( be_valid )
+      end
 
-    it( 'does not have a identifier' ) do
-      @alert.identifier = nil
-      @alert.should_not( be_valid )
-    end
+      it( 'does not have a identifier' ) do
+        @alert.identifier = nil
+        @alert.should_not( be_valid )
+      end
 
-    it( 'does not have a sender' ) do
-      @alert.sender = nil
-      @alert.should_not( be_valid )
-    end
+      it( 'does not have a sender' ) do
+        @alert.sender = nil
+        @alert.should_not( be_valid )
+      end
 
-    it( 'does not have a sent time (sent)' ) do
-      @alert.sent = nil
-      @alert.should_not( be_valid )
-    end
+      it( 'does not have a sent time (sent)' ) do
+        @alert.sent = nil
+        @alert.should_not( be_valid )
+      end
 
-    it( 'does not have a status' ) do
-      @alert.status = nil
-      @alert.should_not( be_valid )
-    end
+      it( 'does not have a status' ) do
+        @alert.status = nil
+        @alert.should_not( be_valid )
+      end
 
-    it( 'does not have a message type (msg_type)' ) do
-      @alert.msg_type = nil
-      @alert.should_not( be_valid )
-    end
+      it( 'does not have a message type (msg_type)' ) do
+        @alert.msg_type = nil
+        @alert.should_not( be_valid )
+      end
 
-    it( 'does not have a scope' ) do
-      @alert.scope = nil
-      @alert.should_not( be_valid )
-    end
+      it( 'does not have a scope' ) do
+        @alert.scope = nil
+        @alert.should_not( be_valid )
+      end
 
 
-    it( 'does not have a valid status' ) do
-      @alert.status = 'incorrect value'
-      @alert.should_not( be_valid )
-    end
+      it( 'does not have a valid status' ) do
+        @alert.status = 'incorrect value'
+        @alert.should_not( be_valid )
+      end
 
-    it( 'does not have a valid message type msg_type' ) do
-      @alert.msg_type = 'incorrect value'
-      @alert.should_not( be_valid )
-    end
+      it( 'does not have a valid message type msg_type' ) do
+        @alert.msg_type = 'incorrect value'
+        @alert.should_not( be_valid )
+      end
 
-    it( 'does not have a valid scope' ) do
-      @alert.scope = 'incorrect value'
-      @alert.should_not( be_valid )
-    end
+      it( 'does not have a valid scope' ) do
+        @alert.scope = 'incorrect value'
+        @alert.should_not( be_valid )
+      end
 
-    it( 'does not have a restriction with a Restricted scope' ) do
-      @alert.scope = RCAP::CAP_1_2::Alert::SCOPE_RESTRICTED
-      @alert.restriction = nil
-      @alert.should_not( be_valid )
-    end
+      it( 'does not have a restriction with a Restricted scope' ) do
+        @alert.scope = RCAP::CAP_1_2::Alert::SCOPE_RESTRICTED
+        @alert.restriction = nil
+        @alert.should_not( be_valid )
+      end
 
-    it( 'does not have any addresses with a Private scope' ) do
-      @alert.scope = RCAP::CAP_1_2::Alert::SCOPE_PRIVATE
-      @alert.addresses.clear
-      @alert.should_not( be_valid )
-    end
+      it( 'does not have any addresses with a Private scope' ) do
+        @alert.scope = RCAP::CAP_1_2::Alert::SCOPE_PRIVATE
+        @alert.addresses.clear
+        @alert.should_not( be_valid )
+      end
 
-    context( 'has an info element and it' ) do
-      it( 'is not valid' ) do
-        @info = RCAP::CAP_1_2::Info.new( :event => 'Info Event',
-                              :categories => RCAP::CAP_1_2::Info::CATEGORY_GEO,
-                              :urgency => RCAP::CAP_1_2::Info::URGENCY_IMMEDIATE,
-                              :severity => RCAP::CAP_1_2::Info::SEVERITY_EXTREME,
-                              :certainty => RCAP::CAP_1_2::Info::CERTAINTY_OBSERVED )
+      it( 'has in invalid info attribute' ) do
+        @info = RCAP::CAP_1_2::Info.new do |info|
+          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
+          info.certainty  = RCAP::CAP_1_2::Info::CERTAINTY_OBSERVED
+        end
         @info.event = nil
         @alert.infos << @info
         @info.should_not( be_valid )
@@ -217,7 +202,9 @@ describe( RCAP::CAP_1_2::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_2/area_spec.rb

@@ -1,9 +1,33 @@
 require 'spec_helper'
 
 describe( RCAP::CAP_1_2::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_2::Area.new
+      @original_area = RCAP::CAP_1_2::Area.new( &@area_builder )
     end
 
     # Atomic
@@ -44,14 +68,8 @@ describe( RCAP::CAP_1_2::Area ) do
 
     context( 'from XML' ) do
       before( :each ) do
-        @original_area = RCAP::CAP_1_2::Area.new( :area_desc => 'Area Description',
-                                       :altitude => 100,
-                                       :ceiling => 200,
-                                       :circles => RCAP::CAP_1_2::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 100 ),
-                                       :geocodes => RCAP::CAP_1_2::Geocode.new( :name => 'name', :value => 'value' ),
-                                       :polygons => RCAP::CAP_1_2::Polygon.new( :points => RCAP::CAP_1_2::Point.new( :lattitude =>1, :longitude => 1 )))
-
-        @alert = RCAP::CAP_1_2::Alert.new( :infos => RCAP::CAP_1_2::Info.new( :areas => @original_area ))
+        @alert = RCAP::CAP_1_2::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_2::Info::XPATH, RCAP::CAP_1_2::Alert::XMLNS )
@@ -64,13 +82,6 @@ describe( RCAP::CAP_1_2::Area ) do
 
     context( 'from YAML Data' ) do
       before( :each ) do
-        @original_area = RCAP::CAP_1_2::Area.new( :area_desc => 'Area Description',
-                                                  :altitude => 100,
-                                                  :ceiling => 200,
-                                                  :circles => RCAP::CAP_1_2::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 100 ),
-                                                  :geocodes => RCAP::CAP_1_2::Geocode.new( :name => 'name', :value => 'value' ),
-                                                  :polygons => RCAP::CAP_1_2::Polygon.new( :points => RCAP::CAP_1_2::Point.new( :lattitude =>1, :longitude => 1 )))
-
         @area = RCAP::CAP_1_2::Area.from_yaml_data( YAML.load( @original_area.to_yaml ))
       end
 
@@ -79,13 +90,6 @@ describe( RCAP::CAP_1_2::Area ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_area = RCAP::CAP_1_2::Area.new( :area_desc => 'Area Description',
-                                       :altitude => 100,
-                                       :ceiling => 200,
-                                       :circles => RCAP::CAP_1_2::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 100 ),
-                                       :geocodes => RCAP::CAP_1_2::Geocode.new( :name => 'name', :value => 'value' ),
-                                       :polygons => RCAP::CAP_1_2::Polygon.new( :points => RCAP::CAP_1_2::Point.new( :lattitude =>1, :longitude => 1 )))
-
         @area = RCAP::CAP_1_2::Area.from_h( @original_area.to_h )
       end
 
@@ -95,13 +99,9 @@ describe( RCAP::CAP_1_2::Area ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @area = RCAP::CAP_1_2::Area.new( :area_desc => 'Area Description',
-                             :altitude => 100,
-                             :ceiling => 200,
-                             :circles => RCAP::CAP_1_2::Circle.new(  :lattitude => 0, :longitude => 0 , :radius => 100 ),
-                             :geocodes => RCAP::CAP_1_2::Geocode.new( :name => 'name', :value => 'value' ),
-                             :polygons => RCAP::CAP_1_2::Polygon.new( :points => RCAP::CAP_1_2::Point.new( :lattitude =>1, :longitude => 1 )))
+      @area = RCAP::CAP_1_2::Area.new( &@area_builder )
     end
+
     context( 'to a hash' ) do
       before( :each ) do
         @area_hash = @area.to_h
@@ -120,7 +120,7 @@ describe( RCAP::CAP_1_2::Area ) do
       end
 
       it( 'should export the circles correctly' ) do
-        @area_hash[ RCAP::CAP_1_2::Area::CIRCLES_KEY ].should == @area.circles.map{ |circle| circle.to_h }
+        @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
@@ -135,7 +135,9 @@ describe( RCAP::CAP_1_2::Area ) do
 
   context( 'is not valid if' ) do
     before( :each ) do
-      @area = RCAP::CAP_1_2::Area.new( :area_desc => "Cape Town Metropole" )
+      @area = RCAP::CAP_1_2::Area.new do |area|
+        area.area_desc = "Cape Town Metropole"
+      end
       @area.should( be_valid )
     end
 
@@ -152,7 +154,11 @@ describe( RCAP::CAP_1_2::Area ) do
 
     context( 'it contains circles and it' ) do
       before( :each ) do
-        @area.circles << RCAP::CAP_1_2::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,12 +170,14 @@ describe( RCAP::CAP_1_2::Area ) do
 
     context( 'it contains polygons and it' ) do
       before( :each ) do
-        @polygon = RCAP::CAP_1_2::Polygon.new
-        @polygon.points.push( RCAP::CAP_1_2::Point.new( :lattitude => 0, :longitude => 0 ),
-                             RCAP::CAP_1_2::Point.new( :lattitude => 0, :longitude => 1 ),
-                             RCAP::CAP_1_2::Point.new( :lattitude => 1, :longitude => 0 ),
-                             RCAP::CAP_1_2::Point.new( :lattitude => 0, :longitude => 0 ))
-        @area.polygons << @polygon
+        @polygon = @area.add_polygon do |polygon|
+          [ 0, 1, 2, 0 ].each do |coordinate|
+            polygon.add_point do |point|
+              point.lattitude = coordinate
+              point.longitude = coordinate
+            end
+          end
+        end
         @area.should( be_valid )
       end
 
@@ -181,8 +189,11 @@ describe( RCAP::CAP_1_2::Area ) do
 
     context( 'it contains geocodes and it' ) do
       before( :each ) do
-        @geocode = RCAP::CAP_1_2::Geocode.new( :name => 'foo', :value => 'bar' )
-        @area.geocodes << @geocode
+        @geocode = @area.add_geocode do |geocode|
+          geocode.name  = 'name'
+          geocode.value = 'value'
+        end
+
         @area.should( be_valid )
       end
 
@@ -214,7 +225,11 @@ describe( RCAP::CAP_1_2::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
@@ -231,7 +246,10 @@ describe( RCAP::CAP_1_2::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_2/circle_spec.rb

@@ -1,16 +1,23 @@
 require 'spec_helper'
 
 describe( RCAP::CAP_1_2::Circle ) do
+  before( :each ) do
+    @circle_builder = lambda do |circle|
+      circle.lattitude = 0
+      circle.longitude = 0
+      circle.radius = 1
+    end
+  end
   describe( '#to_s' ) do
     it( 'should return a correct string' ) do
-      @circle = RCAP::CAP_1_2::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 1 )
+      @circle = RCAP::CAP_1_2::Circle.new( &@circle_builder )
       @circle.to_s.should == '0,0 1'
     end
   end
 
   context( 'should not be valid if' ) do
     before( :each ) do
-      @circle = RCAP::CAP_1_2::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 1 )
+      @circle = RCAP::CAP_1_2::Circle.new( &@circle_builder )
       @circle.should( be_valid )
     end
 
@@ -43,9 +50,9 @@ describe( RCAP::CAP_1_2::Circle ) do
   context( 'on initialisation' ) do
     context( 'from XML' ) do
       before( :each ) do
-        @original_circle = RCAP::CAP_1_2::Circle.new( :radius => 10.5,
-                                             :lattitude => 30, :longitude => 60 )
-        @alert = RCAP::CAP_1_2::Alert.new( :infos => RCAP::CAP_1_2::Info.new( :areas => RCAP::CAP_1_2::Area.new( :circles => @original_circle )))
+        @original_circle = RCAP::CAP_1_2::Circle.new( &@circle_builder )
+        @alert = RCAP::CAP_1_2::Alert.new
+        @alert.add_info.add_area.add_circle( &@circle_builder )
         @xml_string = @alert.to_xml
         @xml_document = REXML::Document.new( @xml_string )
         @info_element = RCAP.xpath_first( @xml_document.root, RCAP::CAP_1_2::Info::XPATH, RCAP::CAP_1_2::Alert::XMLNS )
@@ -66,7 +73,7 @@ describe( RCAP::CAP_1_2::Circle ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_circle = RCAP::CAP_1_2::Circle.new( :radius => 10.5, :lattitude => 30, :longitude => 60 )
+        @original_circle = RCAP::CAP_1_2::Circle.new( &@circle_builder )
         @circle = RCAP::CAP_1_2::Circle.from_h( @original_circle.to_h )
       end
 
@@ -83,12 +90,12 @@ describe( RCAP::CAP_1_2::Circle ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @circle = RCAP::CAP_1_2::Circle.new( :radius => 10.5, :lattitude => 30, :longitude => 60 )
+        @circle = RCAP::CAP_1_2::Circle.new( &@circle_builder )
     end
 
     context( 'to hash' ) do
       it( 'should be correct' ) do
-        @circle.to_h.should == { 'radius' => 10.5, 'lattitude' => 30, 'longitude' => 60 }
+        @circle.to_h.should == { 'radius' => 1, 'lattitude' => 0, 'longitude' => 0 }
       end
     end
   end