rcap 1.3.1 → 2.0.0

data/spec/cap_1_1/info_spec.rb

@@ -1,80 +1,253 @@
 require 'spec_helper'
 
 describe( RCAP::CAP_1_1::Info ) do
+  before( :each ) do
+    @info_constructor = lambda do |info|
+      [ RCAP::CAP_1_1::Info::CATEGORY_GEO, RCAP::CAP_1_1::Info::CATEGORY_FIRE ].each do |category|
+        info.categories << category
+      end
+
+      info.event = 'Event Description'
+
+      [ RCAP::CAP_1_1::Info::RESPONSE_TYPE_MONITOR, RCAP::CAP_1_1::Info::RESPONSE_TYPE_ASSESS ].each do |response_type|
+        info.response_types << response_type
+      end
+
+      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
+      info.audience    = 'Audience'
+      info.effective   = DateTime.now
+      info.onset       = DateTime.now + 1
+      info.expires     = DateTime.now + 2
+      info.sender_name = 'Sender Name'
+      info.headline    = 'Headline'
+      info.description = 'Description'
+      info.instruction = 'Instruction'
+      info.web         = 'http://website'
+      info.contact     = 'contact@address'
+
+      info.add_resource do |resource|
+        resource.resource_desc = 'Resource Description'
+        resource.uri           = 'http://tempuri.org/resource'
+      end
+
+      [{ :name => 'name1', :value => 'value1' }, { :name => 'name2', :value => 'value2' }].each do |event_code_hash|
+        info.add_event_code do |event_code|
+          event_code.name  = event_code_hash[ :name ]
+          event_code.value = event_code_hash[ :value ]
+        end
+      end
+
+      [{ :name => 'name1', :value => 'value1' }, { :name => 'name2', :value => 'value2' }].each do |parameter_hash|
+        info.add_parameter do |parameter|
+          parameter.name  = parameter_hash[ :name ]
+          parameter.value = parameter_hash[ :value ]
+        end
+      end
+
+      [ 'Area1', 'Area2' ].each do |area_desc|
+        info.add_area do |area|
+          area.area_desc = area_desc
+        end
+      end
+    end
+  end
+
   context( 'on initialisation' ) do
     before( :each ) do
       @info = RCAP::CAP_1_1::Info.new
     end
 
-    it( 'should have a default language of en-US' ) { @info.language.should == 'en-US' }
-    it( 'should have no categories' )               { @info.categories.should( be_empty )}
-    it( 'should have no event' )                    { @info.event.should( be_nil )}
-    it( 'should have no response types' )           { @info.response_types.should( be_empty )}
-    it( 'should have no urgency' )                  { @info.urgency.should( be_nil )}
-    it( 'should have no severity' )                 { @info.severity.should( be_nil )}
-    it( 'should have no certainty' )                { @info.certainty.should( be_nil )}
-    it( 'should have no audience' )                 { @info.audience.should( be_nil )}
-    it( 'should have no event_codes' )              { @info.event_codes.should( be_empty )}
-    it( 'should have no effective datetime' )       { @info.effective.should( be_nil )}
-    it( 'should have no onset datetime' )           { @info.onset.should( be_nil )}
-    it( 'should have no expires datetime' )         { @info.expires.should( be_nil )}
-    it( 'should have no sender name ' )             { @info.sender_name.should( be_nil )}
-    it( 'should have no headline' )                 { @info.headline.should( be_nil )}
-    it( 'should have no description' )              { @info.description.should( be_nil )}
-    it( 'should have no instruction' )              { @info.instruction.should( be_nil )}
-    it( 'should have no web' )                      { @info.web.should( be_nil )}
-    it( 'should have no contact' )                  { @info.contact.should( be_nil )}
-    it( 'should have no parameters' )               { @info.parameters.should( be_empty )}
+    it( 'should have a default language of en-US' ) do
+      @info.language.should == 'en-US'
+    end
+
+    it( 'should have no categories' ) do
+      @info.categories.should( be_empty )
+    end
+
+    it( 'should have no event' ) do
+      @info.event.should( be_nil )
+    end
+
+    it( 'should have no response types' ) do
+      @info.response_types.should( be_empty )
+    end
+
+    it( 'should have no urgency' ) do
+      @info.urgency.should( be_nil )
+    end
+
+    it( 'should have no severity' ) do
+      @info.severity.should( be_nil )
+    end
+
+    it( 'should have no certainty' ) do
+      @info.certainty.should( be_nil )
+    end
+
+    it( 'should have no audience' ) do
+      @info.audience.should( be_nil )
+    end
+
+    it( 'should have no event_codes' ) do
+      @info.event_codes.should( be_empty )
+    end
+
+    it( 'should have no effective datetime' ) do
+      @info.effective.should( be_nil )
+    end
+
+    it( 'should have no onset datetime' ) do
+      @info.onset.should( be_nil )
+    end
+
+    it( 'should have no expires datetime' ) do
+      @info.expires.should( be_nil )
+    end
+
+    it( 'should have no sender name ' ) do
+      @info.sender_name.should( be_nil )
+    end
+
+    it( 'should have no headline' ) do
+      @info.headline.should( be_nil )
+    end
+
+    it( 'should have no description' ) do
+      @info.description.should( be_nil )
+    end
+
+    it( 'should have no instruction' ) do
+      @info.instruction.should( be_nil )
+    end
+
+    it( 'should have no web' ) do
+      @info.web.should( be_nil )
+    end
+
+    it( 'should have no contact' ) do
+      @info.contact.should( be_nil )
+    end
+
+    it( 'should have no parameters' ) do
+      @info.parameters.should( be_empty )
+    end
+
 
     shared_examples_for( 'it can parse into a CAP 1.1 Info object' ) do
-      it( 'should parse categories correctly' ){     @info.categories.should_not( be_nil )    ; @info.categories.should     ==    @original_info.categories }
-      it( 'should parse event correctly' ){          @info.event.should_not( be_nil )         ; @info.event.should          ==    @original_info.event }
-      it( 'should parse response_types correctly' ){ @info.response_types.should_not( be_nil ); @info.response_types.should ==    @original_info.response_types }
-      it( 'should parse urgency correctly' ){        @info.urgency.should_not( be_nil )       ; @info.urgency.should        ==    @original_info.urgency }
-      it( 'should parse severity correctly' ){       @info.severity.should_not( be_nil )      ; @info.severity.should       ==    @original_info.severity }
-      it( 'should parse certainty correctly' ){      @info.certainty.should_not( be_nil )     ; @info.certainty.should      ==    @original_info.certainty }
-      it( 'should parse audience correctly' ){       @info.audience.should_not( be_nil )      ; @info.audience.should       ==    @original_info.audience }
-      it( 'should parse effective correctly' ){      @info.effective.should_not( be_nil )     ; @info.effective.should( be_within(Rational( 1, 86400 )).of( @original_info.effective ))}
-      it( 'should parse onset correctly' ){          @info.onset.should_not( be_nil )         ; @info.onset.should( be_within( Rational( 1, 86400 )).of( @original_info.onset ))}
-      it( 'should parse expires correctly' ){        @info.expires.should_not( be_nil )       ; @info.expires.should( be_within( Rational( 1, 86400 )).of( @original_info.expires ))}
-      it( 'should parse sender_name correctly' ){    @info.sender_name.should_not( be_nil )   ; @info.sender_name.should    ==    @original_info.sender_name }
-      it( 'should parse headline correctly' ){       @info.headline.should_not( be_nil )      ; @info.headline.should       ==    @original_info.headline }
-      it( 'should parse description correctly' ){    @info.description.should_not( be_nil )   ; @info.description.should    ==    @original_info.description }
-      it( 'should parse instruction correctly' ){    @info.instruction.should_not( be_nil )   ; @info.instruction.should    ==    @original_info.instruction }
-      it( 'should parse web correctly' ){            @info.web.should_not( be_nil )           ; @info.web.should            ==    @original_info.web }
-      it( 'should parse contact correctly' ){        @info.contact.should_not( be_nil )       ; @info.contact.should        ==    @original_info.contact }
-      it( 'should parse event_codes correctly' ){    @info.event_codes.should_not( be_nil )   ; @info.event_codes.should    ==    @original_info.event_codes }
-      it( 'should parse parameters correctly' ){     @info.parameters.should_not( be_nil )    ; @info.parameters.should     ==    @original_info.parameters }
-      it( 'should parse resources correctly' ){      @info.resources.should_not( be_nil )     ; @info.resources.should      ==    @original_info.resources }
-      it( 'should parse areas correctly' ){          @info.areas.should_not( be_nil )         ; @info.areas.should          ==    @original_info.areas }
+      it( 'should parse categories correctly' ) do
+        @info.categories.should_not( be_nil )
+        @info.categories.should == @original_info.categories
+      end
+
+      it( 'should parse event correctly' ) do
+        @info.event.should_not( be_nil )
+        @info.event.should == @original_info.event
+      end
+
+      it( 'should parse response_types correctly' ) do
+        @info.response_types.should_not( be_nil )
+        @info.response_types.should == @original_info.response_types
+      end
+
+      it( 'should parse urgency correctly' ) do
+        @info.urgency.should_not( be_nil )
+        @info.urgency.should == @original_info.urgency
+      end
+
+      it( 'should parse severity correctly' ) do
+        @info.severity.should_not( be_nil )
+        @info.severity.should == @original_info.severity
+      end
+
+      it( 'should parse certainty correctly' ) do
+        @info.certainty.should_not( be_nil )
+        @info.certainty.should == @original_info.certainty
+      end
+
+      it( 'should parse audience correctly' ) do
+        @info.audience.should_not( be_nil )
+        @info.audience.should == @original_info.audience
+      end
+
+      it( 'should parse effective correctly' ) do
+        @info.effective.should_not( be_nil )
+        @info.effective.should( be_within(Rational( 1, 86400 )).of( @original_info.effective ))
+      end
+
+      it( 'should parse onset correctly' ) do
+        @info.onset.should_not( be_nil )
+        @info.onset.should( be_within( Rational( 1, 86400 )).of( @original_info.onset ))
+      end
+
+      it( 'should parse expires correctly' ) do
+        @info.expires.should_not( be_nil )
+        @info.expires.should( be_within( Rational( 1, 86400 )).of( @original_info.expires ))
+      end
+
+      it( 'should parse sender_name correctly' ) do
+        @info.sender_name.should_not( be_nil )
+        @info.sender_name.should == @original_info.sender_name
+      end
+
+      it( 'should parse headline correctly' ) do
+        @info.headline.should_not( be_nil )
+        @info.headline.should == @original_info.headline
+      end
+
+      it( 'should parse description correctly' ) do
+        @info.description.should_not( be_nil )
+        @info.description.should == @original_info.description
+      end
+
+      it( 'should parse instruction correctly' ) do
+        @info.instruction.should_not( be_nil )
+        @info.instruction.should == @original_info.instruction
+      end
+
+      it( 'should parse web correctly' ) do
+        @info.web.should_not( be_nil )
+        @info.web.should == @original_info.web
+      end
+
+      it( 'should parse contact correctly' ) do
+        @info.contact.should_not( be_nil )
+        @info.contact.should == @original_info.contact
+      end
+
+      it( 'should parse event_codes correctly' ) do
+        @info.event_codes.should_not( be_nil )
+        @info.event_codes.should == @original_info.event_codes
+      end
+
+      it( 'should parse parameters correctly' ) do
+        @info.parameters.should_not( be_nil )
+        @info.parameters.should == @original_info.parameters
+      end
+
+      it( 'should parse resources correctly' ) do
+        @info.resources.should_not( be_empty )
+
+        comparison_attributes = lambda do |resource|
+          resource.resource_desc
+          resource.uri
+        end
+        @info.resources.map( &comparison_attributes ).should == @original_info.resources.map( &comparison_attributes )
+      end
+
+      it( 'should parse areas correctly' ) do
+        @info.areas.should_not( be_nil )
+        @info.areas.should == @original_info.areas
+      end
     end
 
     context( 'from XML' ) do
       before( :each ) do
-        @original_info = RCAP::CAP_1_1::Info.new( :categories     => [ RCAP::CAP_1_1::Info::CATEGORY_GEO, RCAP::CAP_1_1::Info::CATEGORY_FIRE ],
-                                        :event          => 'Event Description',
-                                        :response_types => [ RCAP::CAP_1_1::Info::RESPONSE_TYPE_MONITOR, RCAP::CAP_1_1::Info::RESPONSE_TYPE_ASSESS ],
-                                        :urgency        => RCAP::CAP_1_1::Info::URGENCY_IMMEDIATE,
-                                        :severity       => RCAP::CAP_1_1::Info::SEVERITY_EXTREME,
-                                        :certainty      => RCAP::CAP_1_1::Info::CERTAINTY_OBSERVED,
-                                        :audience       => 'Audience',
-                                        :effective      => DateTime.now,
-                                        :onset          => DateTime.now + 1,
-                                        :expires        => DateTime.now + 2,
-                                        :sender_name    => 'Sender Name',
-                                        :headline       => 'Headline',
-                                        :description    => 'Description',
-                                        :instruction    => 'Instruction',
-                                        :web            => 'http://website',
-                                        :contact        => 'contact@address',
-                                        :event_codes => [ RCAP::CAP_1_1::EventCode.new( :name => 'name1', :value => 'value1' ),
-                                                          RCAP::CAP_1_1::EventCode.new( :name => 'name2', :value => 'value2' )],
-                                        :parameters => [ RCAP::CAP_1_1::Parameter.new( :name => 'name1', :value => 'value1' ),
-                                                         RCAP::CAP_1_1::Parameter.new( :name => 'name2', :value => 'value2' )],
-                                        :areas => [ RCAP::CAP_1_1::Area.new( :area_desc => 'Area1' ),
-                                          RCAP::CAP_1_1::Area.new( :area_desc => 'Area2' )]
-                                      )
-        @alert = RCAP::CAP_1_1::Alert.new( :infos => @original_info )
+        @original_info = RCAP::CAP_1_1::Info.new( &@info_constructor )
+        @alert = RCAP::CAP_1_1::Alert.new
+        @alert.add_info( &@info_constructor )
         @xml_string = @alert.to_xml
         @xml_document = REXML::Document.new( @xml_string )
         @info = RCAP::CAP_1_1::Info.from_xml_element( RCAP.xpath_first( @xml_document.root, RCAP::CAP_1_1::Info::XPATH, RCAP::CAP_1_1::Alert::XMLNS ))
@@ -85,42 +258,24 @@ describe( RCAP::CAP_1_1::Info ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_info = RCAP::CAP_1_1::Info.new( :categories     => [ RCAP::CAP_1_1::Info::CATEGORY_GEO, RCAP::CAP_1_1::Info::CATEGORY_FIRE ],
-                                        :event          => 'Event Description',
-                                        :response_types => [ RCAP::CAP_1_1::Info::RESPONSE_TYPE_MONITOR, RCAP::CAP_1_1::Info::RESPONSE_TYPE_ASSESS ],
-                                        :urgency        => RCAP::CAP_1_1::Info::URGENCY_IMMEDIATE,
-                                        :severity       => RCAP::CAP_1_1::Info::SEVERITY_EXTREME,
-                                        :certainty      => RCAP::CAP_1_1::Info::CERTAINTY_OBSERVED,
-                                        :audience       => 'Audience',
-                                        :effective      => DateTime.now,
-                                        :onset          => DateTime.now + 1,
-                                        :expires        => DateTime.now + 2,
-                                        :sender_name    => 'Sender Name',
-                                        :headline       => 'Headline',
-                                        :description    => 'Description',
-                                        :instruction    => 'Instruction',
-                                        :web            => 'http://website',
-                                        :contact        => 'contact@address',
-                                        :event_codes => [ RCAP::CAP_1_1::EventCode.new( :name => 'name1', :value => 'value1' ),
-                                                          RCAP::CAP_1_1::EventCode.new( :name => 'name2', :value => 'value2' )],
-                                        :parameters => [ RCAP::CAP_1_1::Parameter.new( :name => 'name1', :value => 'value1' ),
-                                                         RCAP::CAP_1_1::Parameter.new( :name => 'name2', :value => 'value2' )],
-                                        :areas => [ RCAP::CAP_1_1::Area.new( :area_desc => 'Area1' ),
-                                          RCAP::CAP_1_1::Area.new( :area_desc => 'Area2' )]
-                                      )
+        @original_info = RCAP::CAP_1_1::Info.new( &@info_constructor )
+
         @info = RCAP::CAP_1_1::Info.from_h( @original_info.to_h )
       end
+
       it_should_behave_like( "it can parse into a CAP 1.1 Info object" )
     end
   end
 
   context( 'is not valid if it' ) do
     before( :each ) 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 = RCAP::CAP_1_1::Info.new 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.valid?
       puts @info.errors.full_messages
       @info.should( be_valid )
@@ -156,29 +311,8 @@ describe( RCAP::CAP_1_1::Info ) do
   describe( 'when exported' ) do
     context( 'to hash' ) do
       before( :each ) do
-        @info = RCAP::CAP_1_1::Info.new( :categories     => [ RCAP::CAP_1_1::Info::CATEGORY_GEO, RCAP::CAP_1_1::Info::CATEGORY_FIRE ],
-                                :event          => 'Event Description',
-                                :response_types => [ RCAP::CAP_1_1::Info::RESPONSE_TYPE_MONITOR, RCAP::CAP_1_1::Info::RESPONSE_TYPE_ASSESS ],
-                                :urgency        => RCAP::CAP_1_1::Info::URGENCY_IMMEDIATE,
-                                :severity       => RCAP::CAP_1_1::Info::SEVERITY_EXTREME,
-                                :certainty      => RCAP::CAP_1_1::Info::CERTAINTY_OBSERVED,
-                                :audience       => 'Audience',
-                                :effective      => DateTime.now,
-                                :onset          => DateTime.now + 1,
-                                :expires        => DateTime.now + 2,
-                                :sender_name    => 'Sender Name',
-                                :headline       => 'Headline',
-                                :description    => 'Description',
-                                :instruction    => 'Instruction',
-                                :web            => 'http://website',
-                                :contact        => 'contact@address',
-                                :resources      => [ RCAP::CAP_1_1::Resource.new( :resource_desc => 'Resource Description', :uri => 'http://tempuri.org/resource' )],
-                                :event_codes    => [ RCAP::CAP_1_1::EventCode.new( :name => 'name1', :value => 'value1' ),
-                                                     RCAP::CAP_1_1::EventCode.new( :name => 'name2', :value => 'value2' )],
-                                :parameters     => [ RCAP::CAP_1_1::Parameter.new( :name => 'name1', :value => 'value1' ),
-                                                     RCAP::CAP_1_1::Parameter.new( :name => 'name2', :value => 'value2' )],
-                                :areas          => [ RCAP::CAP_1_1::Area.new( :area_desc => 'Area1' ),
-                                                     RCAP::CAP_1_1::Area.new( :area_desc => 'Area2' )])
+        @info = RCAP::CAP_1_1::Info.new( &@info_constructor )
+
         @info_hash = @info.to_h
       end
 
@@ -275,7 +409,10 @@ describe( RCAP::CAP_1_1::Info ) do
 
     describe( '#add_event_code' ) do
       before( :each ) do
-        @event_code = @info.add_event_code( name: 'Event Code', value: '1234' )
+        @event_code = @info.add_event_code do |event_code|
+          event_code.name = 'Event Code'
+          event_code.value = '1234'
+        end
       end
 
       it( 'should return a 1.1 EventCode' ) do
@@ -291,7 +428,10 @@ describe( RCAP::CAP_1_1::Info ) do
 
     describe( '#add_parameter' ) do
       before( :each ) do
-        @parameter = @info.add_parameter( name: 'Parameter', value: '1234' )
+        @parameter = @info.add_parameter do |parameter|
+          parameter.name = 'Parameter'
+          parameter.value = '1234'
+        end
       end
 
       it( 'should return a 1.1 Parameter' ) do
@@ -307,7 +447,9 @@ describe( RCAP::CAP_1_1::Info ) do
 
     describe( '#add_resource' ) do
       before( :each ) do
-        @resource = @info.add_resource( resource_desc: 'Resource' )
+        @resource = @info.add_resource do |resource|
+          resource.resource_desc = 'Resource'
+        end
       end
 
       it( 'should return a 1.1 Resource' ) do
@@ -322,7 +464,9 @@ describe( RCAP::CAP_1_1::Info ) do
 
     describe( '#add_area' ) do
       before( :each ) do
-        @area = @info.add_area( area_desc: 'Area' )
+        @area = @info.add_area do |area|
+          area.area_desc = 'Area'
+        end
       end
 
       it( 'should return a 1.1 area' ) do

data/spec/cap_1_1/parameter_spec.rb

@@ -4,8 +4,14 @@ describe( RCAP::CAP_1_1::Parameter ) do
   context( 'when initialised' ) do
     context( 'from XML' ) do
       before( :each ) do
-        @original_parameter = RCAP::CAP_1_1::Parameter.new( :name => 'name', :value => 'value' )
-        @alert = RCAP::CAP_1_1::Alert.new( :infos => RCAP::CAP_1_1::Info.new( :parameters => @original_parameter ))
+
+        @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
         @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 +35,10 @@ describe( RCAP::CAP_1_1::Parameter ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @parameter = RCAP::CAP_1_1::Parameter.new( :name => 'name', :value => 'value' )
+      @parameter = RCAP::CAP_1_1::Parameter.new do |parameter|
+         parameter.name  = 'name'
+         parameter.value = 'value'
+      end
     end
 
     context( 'to a hash' ) do

data/spec/cap_1_1/point_spec.rb

@@ -3,7 +3,10 @@ require 'spec_helper'
 describe( RCAP::CAP_1_1::Point ) do
   describe( 'is not valid if' ) do
     before( :each ) do
-      @point = RCAP::CAP_1_1::Point.new( :lattitude => 0, :longitude => 0 )
+      @point = RCAP::CAP_1_1::Point.new do |point|
+        point.lattitude = 0
+        point.longitude = 0
+      end
       @point.should( be_valid )
     end
 
@@ -34,7 +37,10 @@ describe( RCAP::CAP_1_1::Point ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @point = RCAP::CAP_1_1::Point.new( :lattitude => 1, :longitude => 1 )
+      @point = RCAP::CAP_1_1::Point.new do |point|
+        point.lattitude = 1
+        point.longitude = 1
+      end
     end
 
     context( 'to hash' ) do

data/spec/cap_1_1/polygon_spec.rb

@@ -3,30 +3,52 @@ require 'spec_helper'
 describe( RCAP::CAP_1_1::Polygon ) do
   describe( 'is not valid if it' ) do
     before( :each ) do
-      @polygon = RCAP::CAP_1_1::Polygon.new
-      3.times do
-        @polygon.points << RCAP::CAP_1_1::Point.new( :lattitude => 0, :longitude => 0 )
+      @polygon = RCAP::CAP_1_1::Polygon.new do |polygon|
+        3.times do
+          polygon.add_point do |point|
+            point.lattitude = 0
+            point.longitude = 0
+          end
+        end
+        @polygon.should( be_valid )
       end
-      @polygon.should( be_valid )
-    end
 
-    it( 'does not have any points' ) do
-      @polygon.points.clear
-      @polygon.should_not( be_valid )
-    end
+      it( 'does not have any points' ) do
+        @polygon.points.clear
+        @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 )
+      it( 'does not have a valid collection of points' ) do
+        @polygon.points.first.lattitude = nil
+        @polygon.should_not( be_valid )
+      end
     end
   end
 
   context( 'on initialization' ) do
     context( 'from XML' ) do
       before( :each ) do
-        @original_polygon = RCAP::CAP_1_1::Polygon.new( :points => Array.new(3){|i| RCAP::CAP_1_1::Point.new( :lattitude => i, :longitude => i )})
+        @original_polygon = RCAP::CAP_1_1::Polygon.new do |polygon|
+          3.times do |i|
+            polygon.add_point do |point|
+              point.lattitude = i
+              point.longitude = i
+            end
+          end
+        end
         @empty_original_polygon = RCAP::CAP_1_1::Polygon.new()
-        @alert = RCAP::CAP_1_1::Alert.new( :infos => RCAP::CAP_1_1::Info.new( :areas => RCAP::CAP_1_1::Area.new( :polygons => [@original_polygon, @empty_original_polygon] )))
+        @alert = RCAP::CAP_1_1::Alert.new
+        @alert.add_info.add_area do |area|
+          area.add_polygon do |polygon|
+            3.times do |i|
+              polygon.add_point do |point|
+                point.lattitude = i
+                point.longitude = i
+              end
+            end
+          end
+          area.add_polygon
+        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 )
@@ -51,7 +73,14 @@ describe( RCAP::CAP_1_1::Polygon ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @polygon = RCAP::CAP_1_1::Polygon.new( :points => Array.new(3){|i| RCAP::CAP_1_1::Point.new( :lattitude => i, :longitude => i )})
+        @polygon = RCAP::CAP_1_1::Polygon.new do |polygon|
+          3.times do |i|
+            polygon.add_point do |point|
+              point.lattitude = i
+              point.longitude = i
+            end
+          end
+        end
       end
 
       it( 'should load all the points' ) do
@@ -63,12 +92,19 @@ describe( RCAP::CAP_1_1::Polygon ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @polygon = RCAP::CAP_1_1::Polygon.new( :points => Array.new(3){|i| RCAP::CAP_1_1::Point.new( :lattitude => i, :longitude => i )})
+      @polygon = RCAP::CAP_1_1::Polygon.new do |polygon|
+        3.times do |i|
+          polygon.add_point do |point|
+            point.lattitude = i
+            point.longitude = i
+          end
+        end
+      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_h }}
+        @polygon.to_h.should == { RCAP::CAP_1_1::Polygon::POINTS_KEY => @polygon.points.map{ |point| point.to_a }}
       end
     end
   end
@@ -80,7 +116,10 @@ describe( RCAP::CAP_1_1::Polygon ) do
 
     describe( '#add_point' ) do
       before( :each ) do
-        @point = @polygon.add_point( lattitude: 1, longitude: 1 )
+        @point = @polygon.add_point do |point|
+          point.lattitude = 1
+          point.longitude = 1
+        end
       end
 
       it( 'should return a 1.1 Point' ) do