rcap 1.3.1 → 2.0.0

data/spec/cap_1_0/geocode_spec.rb

@@ -4,8 +4,12 @@ describe( RCAP::CAP_1_0::Geocode ) do
   context( 'when initialised' ) do
     context( 'from XML' ) do
       before( :each ) do
-        @original_geocode = RCAP::CAP_1_0::Geocode.new( :name => 'name', :value => 'value' )
-        @alert = RCAP::CAP_1_0::Alert.new( :infos => RCAP::CAP_1_0::Info.new( :areas => RCAP::CAP_1_0::Area.new( :geocodes => @original_geocode )))
+        @original_geocode = RCAP::CAP_1_0::Geocode.new do |geocode|
+          geocode.name = 'name'
+          geocode.value = 'value'
+        end
+        @alert = RCAP::CAP_1_0::Alert.new
+        @alert.add_info.add_area.geocodes <<  @original_geocode
         @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 )
@@ -17,7 +21,7 @@ describe( RCAP::CAP_1_0::Geocode ) do
       it( 'should parse into the correct class' ) do
         @geocode.class.should == RCAP::CAP_1_0::Geocode
       end
-      
+
       it( 'should parse the name correctly' ) do
         @geocode.name.should == @original_geocode.name
       end
@@ -30,7 +34,10 @@ describe( RCAP::CAP_1_0::Geocode ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @geocode = RCAP::CAP_1_0::Geocode.new( :name => 'name', :value => 'value' )
+      @geocode = RCAP::CAP_1_0::Geocode.new do |geocode|
+        geocode.name = 'name'
+        geocode.value = 'value'
+      end
     end
 
     context( 'to a hash' ) do

data/spec/cap_1_0/info_spec.rb

@@ -1,6 +1,52 @@
 require 'spec_helper'
 
 describe( RCAP::CAP_1_0::Info ) do
+    def create_info
+      RCAP::CAP_1_0::Info.new do |info|
+        [ RCAP::CAP_1_0::Info::CATEGORY_GEO, RCAP::CAP_1_0::Info::CATEGORY_FIRE ].each do |category|
+          info.categories << category
+        end
+        info.event       = 'Event Description'
+        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
+        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
+
+        [ [ 'name1', 'value1' ], [ 'name2', 'value2' ]].each do |name, value|
+          info.add_event_code do |event_code|
+            event_code.name = name
+            event_code.value = value
+          end
+        end
+
+        [ [ 'name1', 'value1' ], [ 'name2', 'value2' ]].each do |name, value|
+          info.add_parameter do |parameter|
+            parameter.name = name
+            parameter.value = 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_0::Info.new
@@ -43,35 +89,16 @@ describe( RCAP::CAP_1_0::Info ) do
       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 resources correctly' ){      @info.resources.should_not( be_nil )  ; @info.resources.map( &:to_s ).should      ==    @original_info.resources.map( &:to_s )}
       it( 'should parse areas correctly' ){          @info.areas.should_not( be_nil )      ; @info.areas.should          ==    @original_info.areas }
     end
 
+
     context( 'from XML' ) do
       before( :each ) do
-        @original_info = RCAP::CAP_1_0::Info.new( :categories     => [ RCAP::CAP_1_0::Info::CATEGORY_GEO, RCAP::CAP_1_0::Info::CATEGORY_FIRE ],
-                                        :event          => 'Event Description',
-                                        :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,
-                                        :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_0::EventCode.new( :name => 'name1', :value => 'value1' ),
-                                                          RCAP::CAP_1_0::EventCode.new( :name => 'name2', :value => 'value2' )],
-                                        :parameters => [ RCAP::CAP_1_0::Parameter.new( :name => 'name1', :value => 'value1' ),
-                                                         RCAP::CAP_1_0::Parameter.new( :name => 'name2', :value => 'value2' )],
-                                        :areas => [ RCAP::CAP_1_0::Area.new( :area_desc => 'Area1' ),
-                                          RCAP::CAP_1_0::Area.new( :area_desc => 'Area2' )]
-                                      )
-        @alert = RCAP::CAP_1_0::Alert.new( :infos => @original_info )
+        @original_info = create_info
+        @alert = RCAP::CAP_1_0::Alert.new
+        @alert.infos << @original_info
         @xml_string = @alert.to_xml
         @xml_document = REXML::Document.new( @xml_string )
         @info = RCAP::CAP_1_0::Info.from_xml_element( RCAP.xpath_first( @xml_document.root, RCAP::CAP_1_0::Info::XPATH, RCAP::CAP_1_0::Alert::XMLNS ))
@@ -82,28 +109,7 @@ describe( RCAP::CAP_1_0::Info ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_info = RCAP::CAP_1_0::Info.new( :categories     => [ RCAP::CAP_1_0::Info::CATEGORY_GEO, RCAP::CAP_1_0::Info::CATEGORY_FIRE ],
-                                        :event          => 'Event Description',
-                                        :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,
-                                        :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_0::EventCode.new( :name => 'name1', :value => 'value1' ),
-                                                          RCAP::CAP_1_0::EventCode.new( :name => 'name2', :value => 'value2' )],
-                                        :parameters => [ RCAP::CAP_1_0::Parameter.new( :name => 'name1', :value => 'value1' ),
-                                                         RCAP::CAP_1_0::Parameter.new( :name => 'name2', :value => 'value2' )],
-                                        :areas => [ RCAP::CAP_1_0::Area.new( :area_desc => 'Area1' ),
-                                          RCAP::CAP_1_0::Area.new( :area_desc => 'Area2' )]
-                                      )
+        @original_info = create_info
         @info = RCAP::CAP_1_0::Info.from_h( @original_info.to_h )
       end
       it_should_behave_like( "it can parse into a CAP 1.0 Info object" )
@@ -112,11 +118,13 @@ describe( RCAP::CAP_1_0::Info ) do
 
   context( 'is not valid if it' ) do
     before( :each ) 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 = RCAP::CAP_1_0::Info.new do |info|
+        info.event = 'Info Event'
+        info.categories <<  RCAP::CAP_1_0::Info::CATEGORY_GEO
+        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.valid?
       puts @info.errors.full_messages
       @info.should( be_valid )
@@ -147,28 +155,7 @@ describe( RCAP::CAP_1_0::Info ) do
   describe( 'when exported' ) do
     context( 'to hash' ) do
       before( :each ) do
-        @info = RCAP::CAP_1_0::Info.new( :categories     => [ RCAP::CAP_1_0::Info::CATEGORY_GEO, RCAP::CAP_1_0::Info::CATEGORY_FIRE ],
-                                :event          => 'Event Description',
-                                :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,
-                                :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_0::Resource.new( :resource_desc => 'Resource Description', :uri => 'http://tempuri.org/resource' )],
-                                :event_codes    => [ RCAP::CAP_1_0::EventCode.new( :name => 'name1', :value => 'value1' ),
-                                                     RCAP::CAP_1_0::EventCode.new( :name => 'name2', :value => 'value2' )],
-                                :parameters     => [ RCAP::CAP_1_0::Parameter.new( :name => 'name1', :value => 'value1' ),
-                                                     RCAP::CAP_1_0::Parameter.new( :name => 'name2', :value => 'value2' )],
-                                :areas          => [ RCAP::CAP_1_0::Area.new( :area_desc => 'Area1' ),
-                                                     RCAP::CAP_1_0::Area.new( :area_desc => 'Area2' )])
+        @info = create_info
         @info_hash = @info.to_h
       end
 
@@ -261,7 +248,10 @@ describe( RCAP::CAP_1_0::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.0 EventCode' ) do
@@ -277,7 +267,10 @@ describe( RCAP::CAP_1_0::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.0 Parameter' ) do
@@ -293,7 +286,9 @@ describe( RCAP::CAP_1_0::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.0 Resource' ) do
@@ -308,7 +303,9 @@ describe( RCAP::CAP_1_0::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.0 area' ) do

data/spec/cap_1_0/parameter_spec.rb

@@ -4,8 +4,12 @@ describe( RCAP::CAP_1_0::Parameter ) do
   context( 'when initialised' ) do
     context( 'from XML' ) do
       before( :each ) do
-        @original_parameter = RCAP::CAP_1_0::Parameter.new( :name => 'name', :value => 'value' )
-        @alert = RCAP::CAP_1_0::Alert.new( :infos => RCAP::CAP_1_0::Info.new( :parameters => @original_parameter ))
+        @original_parameter = RCAP::CAP_1_0::Parameter.new do |parameter|
+          parameter.name = 'name'
+          parameter.value = 'value'
+        end
+        @alert = RCAP::CAP_1_0::Alert.new
+        @alert.add_info.parameters << @original_parameter
         @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::Parameter ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @parameter = RCAP::CAP_1_0::Parameter.new( :name => 'name', :value => 'value' )
+      @parameter = RCAP::CAP_1_0::Parameter.new do |parameter|
+        parameter.name = 'name'
+        parameter.value = 'value'
+      end
     end
 
     context( 'to a hash' ) do
@@ -51,7 +58,10 @@ describe( RCAP::CAP_1_0::Parameter ) do
 
   describe( '.to_xml_element' ) do
     before( :each ) do
-      @parameter = RCAP::CAP_1_0::Parameter.new( :name => 'name', :value => 'value' )
+      @parameter = RCAP::CAP_1_0::Parameter.new do |parameter|
+        parameter.name = 'name'
+        parameter.value = 'value'
+      end
     end
 
     it( 'should generate an XML element correctly' ) do
@@ -61,7 +71,10 @@ describe( RCAP::CAP_1_0::Parameter ) do
 
   describe( '.from_xml_element' ) do
     before( :each ) do
-      @parameter = RCAP::CAP_1_0::Parameter.new( :name => 'name', :value => 'value' )
+      @parameter = RCAP::CAP_1_0::Parameter.new do |parameter|
+        parameter.name = 'name'
+        parameter.value = 'value'
+      end
     end
 
     it( 'should initialise correctly' ) do

data/spec/cap_1_0/point_spec.rb

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

data/spec/cap_1_0/polygon_spec.rb

@@ -3,9 +3,13 @@ require 'spec_helper'
 describe( RCAP::CAP_1_0::Polygon ) do
   describe( 'is not valid if it' ) do
     before( :each ) do
-      @polygon = RCAP::CAP_1_0::Polygon.new
-      3.times do
-        @polygon.points << RCAP::CAP_1_0::Point.new( :lattitude => 0, :longitude => 0 )
+      @polygon = RCAP::CAP_1_0::Polygon.new do |polygon|
+        [1,2,1].each do |i|
+          polygon.add_point do |point|
+            point.lattitude = i
+            point.longitude = i
+          end
+        end
       end
       @polygon.should( be_valid )
     end
@@ -24,9 +28,31 @@ describe( RCAP::CAP_1_0::Polygon ) do
   context( 'on initialization' ) do
     context( 'from XML' ) do
       before( :each ) do
-        @original_polygon = RCAP::CAP_1_0::Polygon.new( :points => Array.new(3){|i| RCAP::CAP_1_0::Point.new( :lattitude => i, :longitude => i )})
+        @original_polygon = RCAP::CAP_1_0::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_0::Polygon.new()
-        @alert = RCAP::CAP_1_0::Alert.new( :infos => RCAP::CAP_1_0::Info.new( :areas => RCAP::CAP_1_0::Area.new( :polygons => [@original_polygon, @empty_original_polygon] )))
+        @alert = RCAP::CAP_1_0::Alert.new
+        @alert.add_info do |info|
+          info.add_area do |area|
+            [ @original_polygon, @empty_original_polygon ].each do |original_polygon|
+              area.add_polygon do |polygon|
+                original_polygon.points.each do |original_point|
+                  polygon.add_point do |point|
+                    point.lattitude = original_point.lattitude
+                    point.longitude = original_point.longitude
+                  end
+                end
+              end
+            end
+          end
+        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 )
@@ -51,7 +77,14 @@ describe( RCAP::CAP_1_0::Polygon ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @polygon = RCAP::CAP_1_0::Polygon.new( :points => Array.new(3){|i| RCAP::CAP_1_0::Point.new( :lattitude => i, :longitude => i )})
+        @polygon = RCAP::CAP_1_0::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 +96,19 @@ describe( RCAP::CAP_1_0::Polygon ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @polygon = RCAP::CAP_1_0::Polygon.new( :points => Array.new(3){|i| RCAP::CAP_1_0::Point.new( :lattitude => i, :longitude => i )})
+      @polygon = RCAP::CAP_1_0::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_0::Polygon::POINTS_KEY => @polygon.points.map{ |point| point.to_h }}
+        @polygon.to_h.should == { RCAP::CAP_1_0::Polygon::POINTS_KEY => @polygon.points.map{ |point| point.to_a }}
       end
     end
   end
@@ -80,7 +120,10 @@ describe( RCAP::CAP_1_0::Polygon ) do
 
     describe( '#add_point' ) do
       before( :each ) do
-        @point = @polygon.add_point( lattitude: 1, longitude: 1 )
+        @point = @polygon.add_point do |polygon|
+          polygon.lattitude = 1
+          polygon.longitude = 1
+        end
       end
 
       it( 'should return a 1.0 Point' ) do

data/spec/cap_1_0/resource_spec.rb

@@ -14,14 +14,16 @@ describe( RCAP::CAP_1_0::Resource ) do
 
     context( 'from XML' ) do
       before( :each ) do
-        @original_resource = RCAP::CAP_1_0::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.size          = 20480
-        @original_resource.digest        = "2048"
-
-        @alert = RCAP::CAP_1_0::Alert.new( :infos => RCAP::CAP_1_0::Info.new( :resources => @original_resource ))
+        @original_resource = RCAP::CAP_1_0::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.size          = 20480
+          resource.digest        = "2048"
+        end
+
+        @alert = RCAP::CAP_1_0::Alert.new
+        @alert.add_info.resources << @original_resource
         @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 )
@@ -54,12 +56,13 @@ describe( RCAP::CAP_1_0::Resource ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_resource = RCAP::CAP_1_0::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.size          = 20480
-        @original_resource.digest        = "2048"
+        @original_resource = RCAP::CAP_1_0::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.size          = 20480
+          resource.digest        = "2048"
+        end
 
         @resource = RCAP::CAP_1_0::Resource.from_h( @original_resource.to_h )
       end
@@ -89,12 +92,13 @@ describe( RCAP::CAP_1_0::Resource ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @resource = RCAP::CAP_1_0::Resource.new
-      @resource.resource_desc = "Image of incident"
-      @resource.uri           = "http://capetown.gov.za/cap/resources/image.png"
-      @resource.mime_type     = 'image/png'
-      @resource.size          = 20480
-      @resource.digest        = "2048"
+      @resource = RCAP::CAP_1_0::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.size          = 20480
+        resource.digest        = "2048"
+      end
     end
 
     context( 'to a hash' ) do
@@ -132,7 +136,10 @@ describe( RCAP::CAP_1_0::Resource ) do
 
   context( 'which is valid' ) do
     before( :each ) do
-      @resource = RCAP::CAP_1_0::Resource.new( :resource_desc => 'Resource Description' )
+      @resource = RCAP::CAP_1_0::Resource.new do |resource|
+        resource.resource_desc = 'Resource Description'
+      end
+
       @resource.should( be_valid )
     end