rcap 2.4.1 → 2.7.3

data/spec/cap_1_2/alert_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe( RCAP::CAP_1_2::Alert ) do
-  before( :each ) do
+describe(RCAP::CAP_1_2::Alert) do
+  before(:each) do
     @alert_builder = lambda do |alert|
       alert.sender      = 'Sender'
       alert.sent        = DateTime.now
@@ -9,17 +9,17 @@ describe( RCAP::CAP_1_2::Alert ) do
       alert.scope       = RCAP::CAP_1_2::Alert::SCOPE_PUBLIC
       alert.source      = 'Source'
       alert.restriction = 'No Restriction'
-      [ 'Address 1', 'Address 2'].each do |address|
+      ['Address 1', 'Address 2'].each do |address|
         alert.addresses << address
       end
-      [ 'Code1', 'Code2' ].each do |code|
+      %w(Code1 Code2).each do |code|
         alert.codes << code
       end
       alert.note        = 'Note'
-      [ 'Reference1', 'Reference2' ].each do |reference|
+      %w(Reference1 Reference2).each do |reference|
         alert.references << reference
       end
-      [ 'Incident1', 'Incident2' ].each do |incident|
+      %w(Incident1 Incident2).each do |incident|
         alert.incidents << incident
       end
       2.times do
@@ -28,158 +28,157 @@ describe( RCAP::CAP_1_2::Alert ) do
     end
   end
 
-  context( 'on initialisation' ) do
-    before( :each )  do
+  context('on initialisation') do
+    before(:each)  do
       @alert = RCAP::CAP_1_2::Alert.new
     end
 
-    it( 'should have a identifier' ){ @alert.identifier.should_not( be_nil )}
-    it( 'should not have a sender' ){ @alert.sender.should( be_nil )}
-    it( 'should not have a sent time' ){ @alert.sent.should( be_nil )}
-    it( 'should not have a status' ){ @alert.status.should( be_nil )}
-    it( 'should not have a scope' ){ @alert.scope.should( be_nil )}
-    it( 'should not have a source'){ @alert.source.should( be_nil )}
-    it( 'should not have a restriction'){ @alert.restriction.should( be_nil )}
-    it( 'should not have any addresses' ){ @alert.addresses.should( be_empty )}
-    it( 'should not have any codes' ){ @alert.codes.should( be_empty )}
-    it( 'should not have a note' ){ @alert.note.should( be_nil )}
-    it( 'should not have any references' ){ @alert.references.should( be_empty )}
-    it( 'should not have any incidents' ){ @alert.incidents.should( be_empty )}
-    it( 'should not have any infos' ){ @alert.infos.should( be_empty )}
-
-    shared_examples_for( "a successfully parsed CAP 1.2 alert" ) do
-      it( 'should parse identifier correctly' ) { @alert.identifier.should  == @original_alert.identifier }
-      it( 'should parse sender correctly' )     { @alert.sender.should      == @original_alert.sender }
-      it( 'should parse sent correctly' )       { @alert.sent.should( be_within( 1 ).of( @original_alert.sent ))}
-      it( 'should parse status correctly' )     { @alert.status.should      == @original_alert.status }
-      it( 'should parse msg_type correctly' )   { @alert.msg_type.should    == @original_alert.msg_type }
-      it( 'should parse source correctly' )     { @alert.source.should      == @original_alert.source }
-      it( 'should parse scope correctly' )      { @alert.scope.should       == @original_alert.scope }
-      it( 'should parse restriction correctly' ){ @alert.restriction.should == @original_alert.restriction }
-      it( 'should parse addresses correctly' )  { @alert.addresses.should   == @original_alert.addresses }
-      it( 'should parse codes correctly' )      { @alert.codes              == @original_alert.codes }
-      it( 'should parse note correctly' )       { @alert.note.should        == @original_alert.note }
-      it( 'should parse references correctly' ) { @alert.references.should  == @original_alert.references }
-      it( 'should parse incidents correctly' )  { @alert.incidents.should   == @original_alert.incidents }
-      it( 'should parse infos correctly' ) do
+    it('should have a identifier') { @alert.identifier.should_not(be_nil) }
+    it('should not have a sender') { @alert.sender.should(be_nil) }
+    it('should not have a sent time') { @alert.sent.should(be_nil) }
+    it('should not have a status') { @alert.status.should(be_nil) }
+    it('should not have a scope') { @alert.scope.should(be_nil) }
+    it('should not have a source') { @alert.source.should(be_nil) }
+    it('should not have a restriction') { @alert.restriction.should(be_nil) }
+    it('should not have any addresses') { @alert.addresses.should(be_empty) }
+    it('should not have any codes') { @alert.codes.should(be_empty) }
+    it('should not have a note') { @alert.note.should(be_nil) }
+    it('should not have any references') { @alert.references.should(be_empty) }
+    it('should not have any incidents') { @alert.incidents.should(be_empty) }
+    it('should not have any infos') { @alert.infos.should(be_empty) }
+
+    shared_examples_for('a successfully parsed CAP 1.2 alert') do
+      it('should parse identifier correctly') { @alert.identifier.should  == @original_alert.identifier }
+      it('should parse sender correctly')     { @alert.sender.should      == @original_alert.sender }
+      it('should parse sent correctly')       { @alert.sent.should(be_within(1).of(@original_alert.sent)) }
+      it('should parse status correctly')     { @alert.status.should      == @original_alert.status }
+      it('should parse msg_type correctly')   { @alert.msg_type.should    == @original_alert.msg_type }
+      it('should parse source correctly')     { @alert.source.should      == @original_alert.source }
+      it('should parse scope correctly')      { @alert.scope.should       == @original_alert.scope }
+      it('should parse restriction correctly') { @alert.restriction.should == @original_alert.restriction }
+      it('should parse addresses correctly')  { @alert.addresses.should   == @original_alert.addresses }
+      it('should parse codes correctly')      { @alert.codes              == @original_alert.codes }
+      it('should parse note correctly')       { @alert.note.should        == @original_alert.note }
+      it('should parse references correctly') { @alert.references.should  == @original_alert.references }
+      it('should parse incidents correctly')  { @alert.incidents.should   == @original_alert.incidents }
+      it('should parse infos correctly') do
         @alert.infos.size.should == @original_alert.infos.size
-        @alert.infos.each{ |info| info.class.should == RCAP::CAP_1_2::Info }
+        @alert.infos.each { |info| info.class.should == RCAP::CAP_1_2::Info }
       end
     end
 
-    context( 'from XML' ) do
-      before( :each ) do
-        @original_alert = RCAP::CAP_1_2::Alert.new( &@alert_builder )
+    context('from XML') do
+      before(:each) do
+        @original_alert = RCAP::CAP_1_2::Alert.new(&@alert_builder)
         @xml_string = @original_alert.to_xml
-        @xml_document = REXML::Document.new( @xml_string )
+        @xml_document = REXML::Document.new(@xml_string)
         @alert_element = @xml_document.root
-        @alert = RCAP::CAP_1_2::Alert.from_xml_element( @alert_element )
+        @alert = RCAP::CAP_1_2::Alert.from_xml_element(@alert_element)
       end
 
-      it_should_behave_like( "a successfully parsed CAP 1.2 alert" )
+      it_should_behave_like('a successfully parsed CAP 1.2 alert')
 
     end
 
-    context( 'from YAML' ) do
-      before( :each ) do
-        @original_alert = RCAP::CAP_1_2::Alert.new( &@alert_builder )
+    context('from YAML') do
+      before(:each) do
+        @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 )
+        @alert = RCAP::CAP_1_2::Alert.from_yaml(@yaml_string)
       end
 
-      it_should_behave_like( "a successfully parsed CAP 1.2 alert" )
+      it_should_behave_like('a successfully parsed CAP 1.2 alert')
     end
 
-    context( 'from a hash' ) do
-      before( :each ) do
-        @original_alert = RCAP::CAP_1_2::Alert.new( &@alert_builder )
-        @alert = RCAP::CAP_1_2::Alert.from_h( @original_alert.to_h )
+    context('from a hash') do
+      before(:each) do
+        @original_alert = RCAP::CAP_1_2::Alert.new(&@alert_builder)
+        @alert = RCAP::CAP_1_2::Alert.from_h(@original_alert.to_h)
       end
 
-      it_should_behave_like( "a successfully parsed CAP 1.2 alert" )
+      it_should_behave_like('a successfully parsed CAP 1.2 alert')
     end
 
-    context( 'from JSON' ) do
-      before( :each ) do
-        @original_alert = RCAP::CAP_1_2::Alert.new( &@alert_builder )
-        @alert = RCAP::CAP_1_2::Alert.from_json( @original_alert.to_json )
+    context('from JSON') do
+      before(:each) do
+        @original_alert = RCAP::CAP_1_2::Alert.new(&@alert_builder)
+        @alert = RCAP::CAP_1_2::Alert.from_json(@original_alert.to_json)
       end
 
-      it_should_behave_like( "a successfully parsed CAP 1.2 alert" )
+      it_should_behave_like('a successfully parsed CAP 1.2 alert')
     end
   end
 
-  describe( 'is not valid if it' ) do
-    before( :each ) do
+  describe('is not valid if it') do
+    before(:each) do
       @alert = RCAP::CAP_1_2::Alert.new do |alert|
         alert.identifier = 'Identifier'
-        alert.sender     = "cap@tempuri.org"
+        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 )
+        @alert.should(be_valid)
       end
 
-      it( 'does not have a identifier' ) do
+      it('does not have a identifier') do
         @alert.identifier = nil
-        @alert.should_not( be_valid )
+        @alert.should_not(be_valid)
       end
 
-      it( 'does not have a sender' ) do
+      it('does not have a sender') do
         @alert.sender = nil
-        @alert.should_not( be_valid )
+        @alert.should_not(be_valid)
       end
 
-      it( 'does not have a sent time (sent)' ) do
+      it('does not have a sent time (sent)') do
         @alert.sent = nil
-        @alert.should_not( be_valid )
+        @alert.should_not(be_valid)
       end
 
-      it( 'does not have a status' ) do
+      it('does not have a status') do
         @alert.status = nil
-        @alert.should_not( be_valid )
+        @alert.should_not(be_valid)
       end
 
-      it( 'does not have a message type (msg_type)' ) do
+      it('does not have a message type (msg_type)') do
         @alert.msg_type = nil
-        @alert.should_not( be_valid )
+        @alert.should_not(be_valid)
       end
 
-      it( 'does not have a scope' ) do
+      it('does not have a scope') do
         @alert.scope = nil
-        @alert.should_not( be_valid )
+        @alert.should_not(be_valid)
       end
 
-
-      it( 'does not have a valid status' ) do
+      it('does not have a valid status') do
         @alert.status = 'incorrect value'
-        @alert.should_not( be_valid )
+        @alert.should_not(be_valid)
       end
 
-      it( 'does not have a valid message type msg_type' ) do
+      it('does not have a valid message type msg_type') do
         @alert.msg_type = 'incorrect value'
-        @alert.should_not( be_valid )
+        @alert.should_not(be_valid)
       end
 
-      it( 'does not have a valid scope' ) do
+      it('does not have a valid scope') do
         @alert.scope = 'incorrect value'
-        @alert.should_not( be_valid )
+        @alert.should_not(be_valid)
       end
 
-      it( 'does not have a restriction with a Restricted scope' ) do
+      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 )
+        @alert.should_not(be_valid)
       end
 
-      it( 'does not have any addresses with a Private scope' ) do
+      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 )
+        @alert.should_not(be_valid)
       end
 
-      it( 'has in invalid info attribute' ) do
+      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
@@ -189,38 +188,38 @@ describe( RCAP::CAP_1_2::Alert ) do
         end
         @info.event = nil
         @alert.infos << @info
-        @info.should_not( be_valid )
-        @alert.should_not( be_valid )
+        @info.should_not(be_valid)
+        @alert.should_not(be_valid)
       end
     end
   end
 
-  describe( 'instance methods' ) do
-    before( :each ) do
+  describe('instance methods') do
+    before(:each) do
       @alert = RCAP::CAP_1_2::Alert.new
     end
 
-    describe( '#add_info' ) do
-      before( :each ) do
+    describe('#add_info') do
+      before(:each) do
         @info = @alert.add_info do |info|
           info.urgency = 'urgent'
         end
         @info.urgency.should == 'urgent'
       end
 
-      it( 'should return a CAP 1.2 Info object' ) do
+      it('should return a CAP 1.2 Info object') do
         @info.class.should == RCAP::CAP_1_2::Info
       end
 
-      it( 'should add an Info object to the infos array' ) do
+      it('should add an Info object to the infos array') do
         @alert.infos.size.should == 1
       end
     end
 
-    describe( '#to_xml' ) do
-      context( 'with pretty_print = true' ) do
-        it( 'should not raise an exception' ) do
-          lambda{ @alert.to_xml( true ) }.should_not( raise_exception )
+    describe('#to_xml') do
+      context('with pretty_print = true') do
+        it('should not raise an exception') do
+          lambda { @alert.to_xml(true) }.should_not(raise_exception)
         end
       end
     end

data/spec/cap_1_2/area_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe( RCAP::CAP_1_2::Area ) do
-  before( :each ) do
+describe(RCAP::CAP_1_2::Area) do
+  before(:each) do
     @area_builder = lambda do |area|
       area.area_desc = 'Area Description'
       area.altitude  = 100
@@ -24,207 +24,207 @@ describe( RCAP::CAP_1_2::Area ) do
       end
     end
   end
-  context( 'on initialisation' ) do
-    before( :each ) do
+  context('on initialisation') do
+    before(:each) do
       @area = RCAP::CAP_1_2::Area.new
-      @original_area = RCAP::CAP_1_2::Area.new( &@area_builder )
+      @original_area = RCAP::CAP_1_2::Area.new(&@area_builder)
     end
 
     # Atomic
-    it( 'should not have a area_desc' ){ @area.area_desc.should( be_nil )}
-    it( 'should not have a altitude' ){ @area.altitude.should( be_nil )}
-    it( 'should not have a ceiling' ){ @area.ceiling.should( be_nil )}
+    it('should not have a area_desc') { @area.area_desc.should(be_nil) }
+    it('should not have a altitude') { @area.altitude.should(be_nil) }
+    it('should not have a ceiling') { @area.ceiling.should(be_nil) }
 
     # Group
-    it( 'should have an empty polygons' ){ @area.polygons.should( be_empty )}
-    it( 'should have an empty circles' ){ @area.circles.should( be_empty )}
-    it( 'should have an empty geocodes' ){ @area.geocodes.should( be_empty )}
+    it('should have an empty polygons') { @area.polygons.should(be_empty) }
+    it('should have an empty circles') { @area.circles.should(be_empty) }
+    it('should have an empty geocodes') { @area.geocodes.should(be_empty) }
 
-    shared_examples_for( "it can parse into a CAP 1.2 Area object" ) do
-      it( 'should parse the area_desc correctly' ) do
+    shared_examples_for('it can parse into a CAP 1.2 Area object') do
+      it('should parse the area_desc correctly') do
         @area.area_desc.should == @original_area.area_desc
       end
 
-      it( 'should parse the altitude correctly' ) do
+      it('should parse the altitude correctly') do
         @area.altitude.should == @original_area.altitude
       end
 
-      it( 'should parse the ceiling correctly' ) do
+      it('should parse the ceiling correctly') do
         @area.ceiling.should == @original_area.ceiling
       end
 
-      it( 'should parse the circles correctly' ) do
+      it('should parse the circles correctly') do
         @area.circles.should == @original_area.circles
       end
 
-      it( 'should parse the geocodes correctly' ) do
+      it('should parse the geocodes correctly') do
         @area.geocodes.should == @original_area.geocodes
       end
 
-      it( 'should parse the polygons correctly' ) do
+      it('should parse the polygons correctly') do
         @area.polygons.should == @original_area.polygons
       end
     end
 
-    context( 'from XML' ) do
-      before( :each ) do
+    context('from XML') do
+      before(:each) do
         @alert = RCAP::CAP_1_2::Alert.new
-        @alert.add_info.add_area( &@area_builder )
+        @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 )
-        @area_xml_element = RCAP.xpath_first( @info_xml_element, RCAP::CAP_1_2::Area::XPATH, RCAP::CAP_1_2::Alert::XMLNS )
-        @area = RCAP::CAP_1_2::Area.from_xml_element( @area_xml_element )
+        @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)
+        @area_xml_element = RCAP.xpath_first(@info_xml_element, RCAP::CAP_1_2::Area::XPATH, RCAP::CAP_1_2::Alert::XMLNS)
+        @area = RCAP::CAP_1_2::Area.from_xml_element(@area_xml_element)
       end
 
-      it_should_behave_like( "it can parse into a CAP 1.2 Area object" )
+      it_should_behave_like('it can parse into a CAP 1.2 Area object')
     end
 
-    context( 'from YAML Data' ) do
-      before( :each ) do
-        @area = RCAP::CAP_1_2::Area.from_yaml_data( YAML.load( @original_area.to_yaml ))
+    context('from YAML Data') do
+      before(:each) do
+        @area = RCAP::CAP_1_2::Area.from_yaml_data(YAML.load(@original_area.to_yaml))
       end
 
-      it_should_behave_like( "it can parse into a CAP 1.2 Area object" )
+      it_should_behave_like('it can parse into a CAP 1.2 Area object')
     end
 
-    context( 'from a hash' ) do
-      before( :each ) do
-        @area = RCAP::CAP_1_2::Area.from_h( @original_area.to_h )
+    context('from a hash') do
+      before(:each) do
+        @area = RCAP::CAP_1_2::Area.from_h(@original_area.to_h)
       end
 
-      it_should_behave_like( "it can parse into a CAP 1.2 Area object" )
+      it_should_behave_like('it can parse into a CAP 1.2 Area object')
     end
   end
 
-  context( 'when exported' ) do
-    before( :each ) do
-      @area = RCAP::CAP_1_2::Area.new( &@area_builder )
+  context('when exported') do
+    before(:each) do
+      @area = RCAP::CAP_1_2::Area.new(&@area_builder)
     end
 
-    context( 'to a hash' ) do
-      before( :each ) do
+    context('to a hash') do
+      before(:each) do
         @area_hash = @area.to_h
       end
 
-      it( 'should export the area description correctly' ) do
-        @area_hash[ RCAP::CAP_1_2::Area::AREA_DESC_KEY ].should == @area.area_desc
+      it('should export the area description correctly') do
+        @area_hash[ RCAP::CAP_1_2::Area::AREA_DESC_KEY].should == @area.area_desc
       end
 
-      it( 'should export the altitude correctly' ) do
-        @area_hash[ RCAP::CAP_1_2::Area::ALTITUDE_KEY ].should == @area.altitude
+      it('should export the altitude correctly') do
+        @area_hash[ RCAP::CAP_1_2::Area::ALTITUDE_KEY].should == @area.altitude
       end
 
-      it( 'should set the ceiling correctly' ) do
-        @area_hash[ RCAP::CAP_1_2::Area::CEILING_KEY ].should == @area.ceiling
+      it('should set the ceiling correctly') do
+        @area_hash[ RCAP::CAP_1_2::Area::CEILING_KEY].should == @area.ceiling
       end
 
-      it( 'should export the circles correctly' ) do
-        @area_hash[ RCAP::CAP_1_2::Area::CIRCLES_KEY ].should == @area.circles.map{ |circle| circle.to_a }
+      it('should export the circles correctly') do
+        @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
-        @area_hash[ RCAP::CAP_1_2::Area::GEOCODES_KEY ].should == @area.geocodes.map{ |geocode| geocode.to_h }
+      it('should export the geocodes correctly') do
+        @area_hash[ RCAP::CAP_1_2::Area::GEOCODES_KEY].should == @area.geocodes.map { |geocode| geocode.to_h }
       end
 
-      it( 'should export the polygons correctly' ) do
-        @area_hash[ RCAP::CAP_1_2::Area::POLYGONS_KEY ].should == @area.polygons.map{ |polygon| polygon.to_h }
+      it('should export the polygons correctly') do
+        @area_hash[ RCAP::CAP_1_2::Area::POLYGONS_KEY].should == @area.polygons.map { |polygon| polygon.to_h }
       end
     end
   end
 
-  context( 'is not valid if' ) do
-    before( :each ) do
+  context('is not valid if') do
+    before(:each) do
       @area = RCAP::CAP_1_2::Area.new do |area|
-        area.area_desc = "Cape Town Metropole"
+        area.area_desc = 'Cape Town Metropole'
       end
-      @area.should( be_valid )
+      @area.should(be_valid)
     end
 
-    it( 'does not have an area descrtiption (area_desc)') do
+    it('does not have an area descrtiption (area_desc)') do
       @area.area_desc = nil
-      @area.should_not( be_valid )
+      @area.should_not(be_valid)
     end
 
-    it( 'has a ceiling defined but no altitude' ) do
+    it('has a ceiling defined but no altitude') do
       @area.ceiling = 1
       @area.altitude = nil
-      @area.should_not( be_valid )
+      @area.should_not(be_valid)
     end
 
-    context( 'it contains circles and it' ) do
-      before( :each ) do
+    context('it contains circles and it') do
+      before(:each) do
         @area.add_circle do |circle|
           circle.lattitude = 0
           circle.longitude = 0
           circle.radius = 1
         end
-        @area.should( be_valid )
+        @area.should(be_valid)
       end
 
-      it( 'has an invalid circle' ) do
+      it('has an invalid circle') do
         @area.circles.first.lattitude = nil
-        @area.should_not( be_valid )
+        @area.should_not(be_valid)
       end
     end
 
-    context( 'it contains polygons and it' ) do
-      before( :each ) do
+    context('it contains polygons and it') do
+      before(:each) do
         @polygon = @area.add_polygon do |polygon|
-          [ 0, 1, 2, 0 ].each do |coordinate|
+          [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 )
+        @area.should(be_valid)
       end
 
-      it( 'has an invalid polygon' ) do
+      it('has an invalid polygon') do
         @polygon.points.first.lattitude = nil
-        @area.should_not( be_valid )
+        @area.should_not(be_valid)
       end
     end
 
-    context( 'it contains geocodes and it' ) do
-      before( :each ) do
+    context('it contains geocodes and it') do
+      before(:each) do
         @geocode = @area.add_geocode do |geocode|
           geocode.name  = 'name'
           geocode.value = 'value'
         end
 
-        @area.should( be_valid )
+        @area.should(be_valid)
       end
 
-      it( 'has an invalid geocode' ) do
-        @geocode.value = nil
-        @area.should_not( be_valid )
+      it('has an invalid geocode') do
+        @geocode.name = nil
+        @area.should_not(be_valid)
       end
     end
   end
 
-  describe( 'instance methods' ) do
-    before( :each ) do
+  describe('instance methods') do
+    before(:each) do
       @area = RCAP::CAP_1_2::Area.new
     end
 
-    describe( '#add_polygon' ) do
-      before( :each ) do
+    describe('#add_polygon') do
+      before(:each) do
         @polygon = @area.add_polygon
       end
 
-      it( 'should return a CAP 1.1 Polygon' ) do
+      it('should return a CAP 1.1 Polygon') do
         @polygon.class.should == RCAP::CAP_1_2::Polygon
       end
 
-      it( 'should add a Polygon to the polygons attribute' ) do
+      it('should add a Polygon to the polygons attribute') do
         @area.polygons.size.should == 1
       end
     end
 
-    describe( '#add_circle' ) do
-      before( :each ) do
+    describe('#add_circle') do
+      before(:each) do
         @circle = @area.add_circle do |circle|
           circle.lattitude = 1
           circle.longitude = 1
@@ -232,33 +232,33 @@ describe( RCAP::CAP_1_2::Area ) do
         end
       end
 
-      it( 'should return a CAP 1.1 Circle' ) do
+      it('should return a CAP 1.1 Circle') do
         @circle.class.should == RCAP::CAP_1_2::Circle
         @circle.lattitude.should == 1
         @circle.longitude.should == 1
         @circle.radius.should == 1
       end
 
-      it( 'should add a circle to the circles attribute' ) do
+      it('should add a circle to the circles attribute') do
         @area.circles.size.should == 1
       end
     end
 
-    describe( '#add_geocode' ) do
-      before( :each ) do
+    describe('#add_geocode') do
+      before(:each) do
         @geocode = @area.add_geocode do |geocode|
           geocode.name = 'Geocode'
           geocode.value = '123'
         end
       end
 
-      it( 'should return a CAP 1.1 Geocode' ) do
+      it('should return a CAP 1.1 Geocode') do
         @geocode.class.should == RCAP::CAP_1_2::Geocode
         @geocode.name.should == 'Geocode'
         @geocode.value.should == '123'
       end
 
-      it( 'should add a geocode to the geocodes attribute' ) do
+      it('should add a geocode to the geocodes attribute') do
         @area.geocodes.size.should == 1
       end
     end