rcap 0.4 → 1.0.0.rc.1

data/spec/cap_1_1/area_spec.rb

@@ -0,0 +1,247 @@
+require 'spec_helper'
+
+describe( RCAP::CAP_1_1::Area ) do
+  context( 'on initialisation' ) do
+    before( :each ) do
+      @area = RCAP::CAP_1_1::Area.new
+    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 )}
+
+    # 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 )}
+
+    shared_examples_for( "it can parse into a CAP 1.1 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
+        @area.altitude.should == @original_area.altitude
+      end
+
+      it( 'should parse the ceiling correctly' ) do
+        @area.ceiling.should == @original_area.ceiling
+      end
+
+      it( 'should parse the circles correctly' ) do
+        @area.circles.should == @original_area.circles
+      end
+
+      it( 'should parse the geocodes correctly' ) do
+        @area.geocodes.should == @original_area.geocodes
+      end
+
+      it( 'should parse the polygons correctly' ) do
+        @area.polygons.should == @original_area.polygons
+      end
+    end
+
+    context( 'from XML' ) do
+      before( :each ) do
+        @original_area = RCAP::CAP_1_1::Area.new( :area_desc => 'Area Description',
+                                       :altitude => 100,
+                                       :ceiling => 200,
+                                       :circles => RCAP::CAP_1_1::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 100 ),
+                                       :geocodes => RCAP::CAP_1_1::Geocode.new( :name => 'name', :value => 'value' ),
+                                       :polygons => RCAP::CAP_1_1::Polygon.new( :points => RCAP::CAP_1_1::Point.new( :lattitude =>1, :longitude => 1 )))
+
+        @alert = RCAP::CAP_1_1::Alert.new( :infos => RCAP::CAP_1_1::Info.new( :areas => @original_area ))
+        @xml_string = @alert.to_xml
+        @xml_document = REXML::Document.new( @xml_string )
+        @info_xml_element = RCAP.xpath_first( @xml_document.root, RCAP::CAP_1_1::Info::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
+        @area_xml_element = RCAP.xpath_first( @info_xml_element, RCAP::CAP_1_1::Area::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
+        @area = RCAP::CAP_1_1::Area.from_xml_element( @area_xml_element )
+      end
+
+      it_should_behave_like( "it can parse into a CAP 1.1 Area object" )
+    end
+
+    context( 'from YAML Data' ) do
+      before( :each ) do
+        @original_area = RCAP::CAP_1_1::Area.new( :area_desc => 'Area Description',
+                                                  :altitude => 100,
+                                                  :ceiling => 200,
+                                                  :circles => RCAP::CAP_1_1::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 100 ),
+                                                  :geocodes => RCAP::CAP_1_1::Geocode.new( :name => 'name', :value => 'value' ),
+                                                  :polygons => RCAP::CAP_1_1::Polygon.new( :points => RCAP::CAP_1_1::Point.new( :lattitude =>1, :longitude => 1 )))
+
+        @area = RCAP::CAP_1_1::Area.from_yaml_data( YAML.load( @original_area.to_yaml ))
+      end
+
+      it_should_behave_like( "it can parse into a CAP 1.1 Area object" )
+    end
+
+    context( 'from a hash' ) do
+      before( :each ) do
+        @original_area = RCAP::CAP_1_1::Area.new( :area_desc => 'Area Description',
+                                       :altitude => 100,
+                                       :ceiling => 200,
+                                       :circles => RCAP::CAP_1_1::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 100 ),
+                                       :geocodes => RCAP::CAP_1_1::Geocode.new( :name => 'name', :value => 'value' ),
+                                       :polygons => RCAP::CAP_1_1::Polygon.new( :points => RCAP::CAP_1_1::Point.new( :lattitude =>1, :longitude => 1 )))
+
+        @area = RCAP::CAP_1_1::Area.from_h( @original_area.to_h )
+      end
+
+      it_should_behave_like( "it can parse into a CAP 1.1 Area object" )
+    end
+  end
+
+  context( 'when exported' ) do
+    before( :each ) do
+      @area = RCAP::CAP_1_1::Area.new( :area_desc => 'Area Description',
+                             :altitude => 100,
+                             :ceiling => 200,
+                             :circles => RCAP::CAP_1_1::Circle.new(  :lattitude => 0, :longitude => 0 , :radius => 100 ),
+                             :geocodes => RCAP::CAP_1_1::Geocode.new( :name => 'name', :value => 'value' ),
+                             :polygons => RCAP::CAP_1_1::Polygon.new( :points => RCAP::CAP_1_1::Point.new( :lattitude =>1, :longitude => 1 )))
+    end
+    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_1::Area::AREA_DESC_KEY ].should == @area.area_desc
+      end
+
+      it( 'should export the altitude correctly' ) do
+        @area_hash[ RCAP::CAP_1_1::Area::ALTITUDE_KEY ].should == @area.altitude
+      end
+
+      it( 'should set the ceiling correctly' ) do
+        @area_hash[ RCAP::CAP_1_1::Area::CEILING_KEY ].should == @area.ceiling
+      end
+
+      it( 'should export the circles correctly' ) do
+        @area_hash[ RCAP::CAP_1_1::Area::CIRCLES_KEY ].should == @area.circles.map{ |circle| circle.to_h }
+      end
+
+      it( 'should export the geocodes correctly' ) do
+        @area_hash[ RCAP::CAP_1_1::Area::GEOCODES_KEY ].should == @area.geocodes.map{ |geocode| geocode.to_h }
+      end
+
+      it( 'should export the polygons correctly' ) do
+        @area_hash[ RCAP::CAP_1_1::Area::POLYGONS_KEY ].should == @area.polygons.map{ |polygon| polygon.to_h }
+      end
+    end
+  end
+
+  context( 'is not valid if' ) do
+    before( :each ) do
+      @area = RCAP::CAP_1_1::Area.new( :area_desc => "Cape Town Metropole" )
+      @area.should( be_valid )
+    end
+
+    it( 'does not have an area descrtiption (area_desc)') do
+      @area.area_desc = nil
+      @area.should_not( be_valid )
+    end
+
+    it( 'has a ceiling defined but no altitude' ) do
+      @area.ceiling = 1
+      @area.altitude = nil
+      @area.should_not( be_valid )
+    end
+
+    context( 'it contains circles and it' ) do
+      before( :each ) do
+        @area.circles << RCAP::CAP_1_1::Circle.new( :lattitude => 0, :longitude => 0, :radius => 1)
+        @area.should( be_valid )
+      end
+
+      it( 'has an invalid circle' ) do
+        @area.circles.first.lattitude = nil
+        @area.should_not( be_valid )
+      end
+    end
+
+    context( 'it contains polygons and it' ) do
+      before( :each ) do
+        @polygon = RCAP::CAP_1_1::Polygon.new
+        @polygon.points.push( RCAP::CAP_1_1::Point.new( :lattitude => 0, :longitude => 0 ),
+                             RCAP::CAP_1_1::Point.new( :lattitude => 0, :longitude => 1 ),
+                             RCAP::CAP_1_1::Point.new( :lattitude => 1, :longitude => 0 ))
+        @area.polygons << @polygon
+        @area.should( be_valid )
+      end
+
+      it( 'has an invalid polygon' ) do
+        @polygon.points.first.lattitude = nil
+        @area.should_not( be_valid )
+      end
+    end
+
+    context( 'it contains geocodes and it' ) do
+      before( :each ) do
+        @geocode = RCAP::CAP_1_1::Geocode.new( :name => 'foo', :value => 'bar' )
+        @area.geocodes << @geocode
+        @area.should( be_valid )
+      end
+
+      it( 'has an invalid geocode' ) do
+        @geocode.value = nil
+        @area.should_not( be_valid )
+      end
+    end
+  end
+
+  describe( 'instance methods' ) do
+    before( :each ) do
+      @area = RCAP::CAP_1_1::Area.new
+    end
+
+    describe( '#add_polygon' ) do
+      before( :each ) do
+        @polygon = @area.add_polygon
+      end
+
+      it( 'should return a CAP 1.1 Polygon' ) do
+        @polygon.class.should == RCAP::CAP_1_1::Polygon
+      end
+
+      it( 'should add a Polygon to the polygons attribute' ) do
+        @area.polygons.size.should == 1
+      end
+    end
+
+    describe( '#add_circle' ) do
+      before( :each ) do
+        @circle = @area.add_circle( lattitude: 1, longitude: 1, radius: 1 )
+      end
+
+      it( 'should return a CAP 1.1 Circle' ) do
+        @circle.class.should == RCAP::CAP_1_1::Circle
+        @circle.lattitude.should == 1
+        @circle.longitude.should == 1
+        @circle.radius.should == 1
+      end
+
+      it( 'should add a circle to the circles attribute' ) do
+        @area.circles.size.should == 1
+      end
+    end
+
+    describe( '#add_geocode' ) do
+      before( :each ) do
+        @geocode = @area.add_geocode( name: 'Geocode', value: '123' )
+      end
+
+      it( 'should return a CAP 1.1 Geocode' ) do
+        @geocode.class.should == RCAP::CAP_1_1::Geocode
+        @geocode.name.should == 'Geocode'
+        @geocode.value.should == '123'
+      end
+
+      it( 'should add a geocode to the geocodes attribute' ) do
+        @area.geocodes.size.should == 1
+      end
+    end
+  end
+end

data/spec/cap_1_1/circle_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe( RCAP::CAP_1_1::Circle ) do
+  describe( 'should not be valid if' ) do
+    before( :each ) do
+      @circle = RCAP::CAP_1_1::Circle.new( :lattitude => 0, :longitude => 0 , :radius => 1 )
+      @circle.should( be_valid )
+    end
+
+    it( 'does not have a lattitude defined' ) do
+      @circle.lattitude = nil
+      @circle.should_not( be_valid )
+    end
+
+    it( 'does not have a longitude defined' ) do
+      @circle.longitude = nil
+      @circle.should_not( be_valid )
+    end
+
+    it( 'does not have a radius defined' ) do
+      @circle.radius = nil
+      @circle.should_not( be_valid )
+    end
+
+    it( 'does not have a numeric radius' ) do
+      @circle.radius = "not a number"
+      @circle.should_not( be_valid )
+    end
+
+    it( 'does not have a positive radius' ) do
+      @circle.radius = -1
+      @circle.should_not( be_valid )
+    end
+  end
+
+  context( 'on initialisation' ) do
+    context( 'from XML' ) do
+      before( :each ) do
+        @original_circle = RCAP::CAP_1_1::Circle.new( :radius => 10.5,
+                                             :lattitude => 30, :longitude => 60 )
+        @alert = RCAP::CAP_1_1::Alert.new( :infos => RCAP::CAP_1_1::Info.new( :areas => RCAP::CAP_1_1::Area.new( :circles => @original_circle )))
+        @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 )
+        @area_element = RCAP.xpath_first( @info_element, RCAP::CAP_1_1::Area::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
+        @circle_element = RCAP.xpath_first( @area_element, RCAP::CAP_1_1::Circle::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
+        @circle = RCAP::CAP_1_1::Circle.from_xml_element( @circle_element )
+      end
+
+      it( 'should parse the radius correctly' ) do
+        @circle.radius.should == @original_circle.radius
+      end
+
+      it( 'should parse the lattitude and longitude correctly' ) do
+        @circle.lattitude.should == @original_circle.lattitude
+        @circle.longitude.should == @original_circle.longitude
+      end
+    end
+
+    context( 'from a hash' ) do
+      before( :each ) do
+        @original_circle = RCAP::CAP_1_1::Circle.new( :radius => 10.5, :lattitude => 30, :longitude => 60 )
+        @circle = RCAP::CAP_1_1::Circle.from_h( @original_circle.to_h )
+      end
+
+      it( 'should set the radius correctly' ) do
+        @circle.radius.should == @original_circle.radius
+      end
+
+      it( 'should parse the lattitude and longitude correctly' ) do
+        @circle.lattitude.should == @original_circle.lattitude
+        @circle.longitude.should == @original_circle.longitude
+      end
+    end
+  end
+
+  context( 'when exported' ) do
+    before( :each ) do
+      @circle = RCAP::CAP_1_1::Circle.new( :radius => 10.5, :lattitude => 30, :longitude => 60 )
+    end
+
+    context( 'to hash' ) do
+      it( 'should be correct' ) do
+        @circle.to_h.should == { 'radius' => 10.5, 'lattitude' => 30, 'longitude' => 60 }
+      end
+    end
+  end
+end

data/spec/{geocode_spec.rb → cap_1_1/geocode_spec.rb}

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-describe( RCAP::Geocode ) do
+describe( RCAP::CAP_1_1::Geocode ) do
   context( 'when initialised' ) do
     context( 'from XML' ) do
       before( :each ) do
-        @original_geocode = RCAP::Geocode.new( :name => 'name', :value => 'value' )
-        @alert = RCAP::Alert.new( :infos => RCAP::Info.new( :areas => RCAP::Area.new( :geocodes => @original_geocode )))
+        @original_geocode = RCAP::CAP_1_1::Geocode.new( :name => 'name', :value => 'value' )
+        @alert = RCAP::CAP_1_1::Alert.new( :infos => RCAP::CAP_1_1::Info.new( :areas => RCAP::CAP_1_1::Area.new( :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::Info::XPATH )
-        @area_xml_element = RCAP.xpath_first( @info_xml_element, RCAP::Area::XPATH )
-        @geocode_xml_element = RCAP.xpath_first( @area_xml_element, RCAP::Geocode::XPATH )
-        @geocode = RCAP::Geocode.from_xml_element( @geocode_xml_element )
+        @info_xml_element = RCAP.xpath_first( @xml_document.root, RCAP::CAP_1_1::Info::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
+        @area_xml_element = RCAP.xpath_first( @info_xml_element, RCAP::CAP_1_1::Area::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
+        @geocode_xml_element = RCAP.xpath_first( @area_xml_element, RCAP::CAP_1_1::Geocode::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
+        @geocode = RCAP::CAP_1_1::Geocode.from_xml_element( @geocode_xml_element )
       end
 
       it( 'should parse the name correctly' ) do
@@ -26,7 +26,7 @@ describe( RCAP::Geocode ) do
 
   context( 'when exported' ) do
     before( :each ) do
-      @geocode = RCAP::Geocode.new( :name => 'name', :value => 'value' )
+      @geocode = RCAP::CAP_1_1::Geocode.new( :name => 'name', :value => 'value' )
     end
 
     context( 'to a hash' ) do

data/spec/{info_spec.rb → cap_1_1/info_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe( RCAP::Info ) do
+describe( RCAP::CAP_1_1::Info ) do
   context( 'on initialisation' ) do
     before( :each ) do
-      @info = RCAP::Info.new
+      @info = RCAP::CAP_1_1::Info.new
     end
 
     it( 'should have a default language of en-US' ) { @info.language.should == 'en-US' }
@@ -26,7 +26,7 @@ describe( RCAP::Info ) do
     it( 'should have no contact' )                  { @info.contact.should( be_nil )}
     it( 'should have no parameters' )               { @info.parameters.should( be_empty )}
 
-    shared_examples_for( 'it can parse into an Info object' ) do
+    shared_examples_for( 'it can parse into a CAP 1.1 Info object' ) do
       it( 'should parse categories correctly' ){     @info .categories.should     ==    @original_info.categories }
       it( 'should parse event correctly' ){          @info .event.should          ==    @original_info.event }
       it( 'should parse response_types correctly' ){ @info .response_types.should ==    @original_info.response_types }
@@ -34,9 +34,9 @@ describe( RCAP::Info ) do
       it( 'should parse severity correctly' ){       @info .severity.should       ==    @original_info.severity }
       it( 'should parse certainty correctly' ){      @info .certainty.should      ==    @original_info.certainty }
       it( 'should parse audience correctly' ){       @info .audience.should       ==    @original_info.audience }
-      it( 'should parse effective correctly' ){      @info .effective.should( be_close( @original_info.effective, Rational( 1, 86400 )))}
-      it( 'should parse onset correctly' ){          @info .onset.should( be_close(     @original_info.onset, Rational( 1, 86400 )))}
-      it( 'should parse expires correctly' ){        @info .expires.should( be_close(   @original_info.expires, Rational( 1, 86400 )))}
+      it( 'should parse effective correctly' ){      @info .effective.should( be_within(Rational( 1, 86400 )).of( @original_info.effective ))}
+      it( 'should parse onset correctly' ){          @info .onset.should( be_within( Rational( 1, 86400 )).of( @original_info.onset ))}
+      it( 'should parse expires correctly' ){        @info .expires.should( be_within( Rational( 1, 86400 )).of( @original_info.expires ))}
       it( 'should parse sender_name correctly' ){    @info .sender_name.should    ==    @original_info.sender_name }
       it( 'should parse headline correctly' ){       @info .headline.should       ==    @original_info.headline }
       it( 'should parse description correctly' ){    @info .description.should    ==    @original_info.description }
@@ -51,12 +51,12 @@ describe( RCAP::Info ) do
 
     context( 'from XML' ) do
       before( :each ) do
-        @original_info = RCAP::Info.new( :categories     => [ RCAP::Info::CATEGORY_GEO, RCAP::Info::CATEGORY_FIRE ],
+        @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::Info::RESPONSE_TYPE_MONITOR, RCAP::Info::RESPONSE_TYPE_ASSESS ],
-                                        :urgency        => RCAP::Info::URGENCY_IMMEDIATE,
-                                        :severity       => RCAP::Info::SEVERITY_EXTREME,
-                                        :certainty      => RCAP::Info::CERTAINTY_OBSERVED,
+                                        :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,
@@ -67,30 +67,30 @@ describe( RCAP::Info ) do
                                         :instruction    => 'Instruction',
                                         :web            => 'http://website',
                                         :contact        => 'contact@address',
-                                        :event_codes => [ RCAP::EventCode.new( :name => 'name1', :value => 'value1' ),
-                                                          RCAP::EventCode.new( :name => 'name2', :value => 'value2' )],
-                                        :parameters => [ RCAP::Parameter.new( :name => 'name1', :value => 'value1' ),
-                                                         RCAP::Parameter.new( :name => 'name2', :value => 'value2' )],
-                                        :areas => [ RCAP::Area.new( :area_desc => 'Area1' ),
-                                          RCAP::Area.new( :area_desc => 'Area2' )]
+                                        :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::Alert.new( :infos => @original_info )
-				@xml_string = @alert.to_xml
-				@xml_document = REXML::Document.new( @xml_string )
-        @info = RCAP::Info.from_xml_element( RCAP.xpath_first( @xml_document.root, RCAP::Info::XPATH ))
+        @alert = RCAP::CAP_1_1::Alert.new( :infos => @original_info )
+        @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 ))
       end
 
-      it_should_behave_like( "it can parse into an Info object" )
+      it_should_behave_like( "it can parse into a CAP 1.1 Info object" )
     end
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_info = RCAP::Info.new( :categories     => [ RCAP::Info::CATEGORY_GEO, RCAP::Info::CATEGORY_FIRE ],
+        @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::Info::RESPONSE_TYPE_MONITOR, RCAP::Info::RESPONSE_TYPE_ASSESS ],
-                                        :urgency        => RCAP::Info::URGENCY_IMMEDIATE,
-                                        :severity       => RCAP::Info::SEVERITY_EXTREME,
-                                        :certainty      => RCAP::Info::CERTAINTY_OBSERVED,
+                                        :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,
@@ -101,31 +101,31 @@ describe( RCAP::Info ) do
                                         :instruction    => 'Instruction',
                                         :web            => 'http://website',
                                         :contact        => 'contact@address',
-                                        :event_codes => [ RCAP::EventCode.new( :name => 'name1', :value => 'value1' ),
-                                                          RCAP::EventCode.new( :name => 'name2', :value => 'value2' )],
-                                        :parameters => [ RCAP::Parameter.new( :name => 'name1', :value => 'value1' ),
-                                                         RCAP::Parameter.new( :name => 'name2', :value => 'value2' )],
-                                        :areas => [ RCAP::Area.new( :area_desc => 'Area1' ),
-                                          RCAP::Area.new( :area_desc => 'Area2' )]
+                                        :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::Info.from_h( @original_info.to_h )
+        @info = RCAP::CAP_1_1::Info.from_h( @original_info.to_h )
       end
-      it_should_behave_like( "it can parse into an Info object" )
+      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::Info.new( :event => 'Info Event',
-                            :categories => RCAP::Info::CATEGORY_GEO,
-                            :urgency => RCAP::Info::URGENCY_IMMEDIATE,
-                            :severity => RCAP::Info::SEVERITY_EXTREME,
-                            :certainty => RCAP::Info::CERTAINTY_OBSERVED )
+      @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.valid?
       puts @info.errors.full_messages
       @info.should( be_valid )
     end
-    
+
     it( 'does not have an event' ) do
       @info.event = nil
       @info.should_not( be_valid )
@@ -156,12 +156,12 @@ describe( RCAP::Info ) do
   describe( 'when exported' ) do
     context( 'to hash' ) do
       before( :each ) do
-        @info = RCAP::Info.new( :categories     => [ RCAP::Info::CATEGORY_GEO, RCAP::Info::CATEGORY_FIRE ],
+        @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::Info::RESPONSE_TYPE_MONITOR, RCAP::Info::RESPONSE_TYPE_ASSESS ],
-                                :urgency        => RCAP::Info::URGENCY_IMMEDIATE,
-                                :severity       => RCAP::Info::SEVERITY_EXTREME,
-                                :certainty      => RCAP::Info::CERTAINTY_OBSERVED,
+                                :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,
@@ -172,99 +172,167 @@ describe( RCAP::Info ) do
                                 :instruction    => 'Instruction',
                                 :web            => 'http://website',
                                 :contact        => 'contact@address',
-                                :resources      => [ RCAP::Resource.new( :resource_desc => 'Resource Description', :uri => 'http://tempuri.org/resource' )],
-                                :event_codes    => [ RCAP::EventCode.new( :name => 'name1', :value => 'value1' ),
-                                                     RCAP::EventCode.new( :name => 'name2', :value => 'value2' )],
-                                :parameters     => [ RCAP::Parameter.new( :name => 'name1', :value => 'value1' ),
-                                                     RCAP::Parameter.new( :name => 'name2', :value => 'value2' )],
-                                :areas          => [ RCAP::Area.new( :area_desc => 'Area1' ),
-                                                     RCAP::Area.new( :area_desc => 'Area2' )])
+                                :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_hash = @info.to_h
       end
 
       it( 'should export the language correctly' ) do
-        @info_hash[ RCAP::Info::LANGUAGE_KEY ].should == @info.language
+        @info_hash[ RCAP::CAP_1_1::Info::LANGUAGE_KEY ].should == @info.language
       end
 
       it( 'should export the categories' ) do
-        @info_hash[ RCAP::Info::CATEGORIES_KEY ].should == @info.categories
+        @info_hash[ RCAP::CAP_1_1::Info::CATEGORIES_KEY ].should == @info.categories
       end
-      
+
       it( 'should export the event' ) do
-        @info_hash[ RCAP::Info::EVENT_KEY ].should == @info.event
+        @info_hash[ RCAP::CAP_1_1::Info::EVENT_KEY ].should == @info.event
       end
 
       it( 'should export the response types' ) do
-        @info_hash[ RCAP::Info::RESPONSE_TYPES_KEY ].should == @info.response_types
+        @info_hash[ RCAP::CAP_1_1::Info::RESPONSE_TYPES_KEY ].should == @info.response_types
       end
 
       it( 'should export the urgency' ) do
-        @info_hash[ RCAP::Info:: URGENCY_KEY ].should == @info.urgency
+        @info_hash[ RCAP::CAP_1_1::Info:: URGENCY_KEY ].should == @info.urgency
       end
 
       it( 'should export the severity' ) do
-        @info_hash[ RCAP::Info:: SEVERITY_KEY ].should == @info.severity
+        @info_hash[ RCAP::CAP_1_1::Info:: SEVERITY_KEY ].should == @info.severity
       end
 
       it( 'should export the certainty' ) do
-        @info_hash[ RCAP::Info:: CERTAINTY_KEY ].should == @info.certainty
+        @info_hash[ RCAP::CAP_1_1::Info:: CERTAINTY_KEY ].should == @info.certainty
       end
 
       it( 'should export the audience' ) do
-        @info_hash[ RCAP::Info:: AUDIENCE_KEY ].should == @info.audience
+        @info_hash[ RCAP::CAP_1_1::Info:: AUDIENCE_KEY ].should == @info.audience
       end
 
       it( 'should export the effective date' ) do
-        @info_hash[ RCAP::Info::EFFECTIVE_KEY ].should == @info.effective.to_s_for_cap
+        @info_hash[ RCAP::CAP_1_1::Info::EFFECTIVE_KEY ].should == @info.effective.to_s_for_cap
       end
 
       it( 'should export the onset date' ) do
-        @info_hash[ RCAP::Info::ONSET_KEY ].should == @info.onset.to_s_for_cap
+        @info_hash[ RCAP::CAP_1_1::Info::ONSET_KEY ].should == @info.onset.to_s_for_cap
       end
 
       it( 'should export the expires date' ) do
-        @info_hash[ RCAP::Info::EXPIRES_KEY ].should == @info.expires.to_s_for_cap
+        @info_hash[ RCAP::CAP_1_1::Info::EXPIRES_KEY ].should == @info.expires.to_s_for_cap
       end
 
        it( 'should export the sender name' ) do
-         @info_hash[ RCAP::Info::SENDER_NAME_KEY ].should == @info.sender_name
+         @info_hash[ RCAP::CAP_1_1::Info::SENDER_NAME_KEY ].should == @info.sender_name
        end
 
        it( 'should export the headline' ) do
-         @info_hash[ RCAP::Info::HEADLINE_KEY ].should == @info.headline
+         @info_hash[ RCAP::CAP_1_1::Info::HEADLINE_KEY ].should == @info.headline
        end
 
        it( 'should export the description' ) do
-         @info_hash[ RCAP::Info::DESCRIPTION_KEY ].should == @info.description
+         @info_hash[ RCAP::CAP_1_1::Info::DESCRIPTION_KEY ].should == @info.description
        end
 
        it( 'should export the instruction' ) do
-         @info_hash[ RCAP::Info::INSTRUCTION_KEY ].should == @info.instruction
+         @info_hash[ RCAP::CAP_1_1::Info::INSTRUCTION_KEY ].should == @info.instruction
        end
 
        it( 'should export the web address ' ) do
-         @info_hash[ RCAP::Info::WEB_KEY ].should == @info.web
+         @info_hash[ RCAP::CAP_1_1::Info::WEB_KEY ].should == @info.web
        end
 
        it( 'should export the contact' ) do
-         @info_hash[ RCAP::Info::CONTACT_KEY ].should == @info.contact
+         @info_hash[ RCAP::CAP_1_1::Info::CONTACT_KEY ].should == @info.contact
        end
 
        it( 'should export the event codes' ) do
-         @info_hash[ RCAP::Info::EVENT_CODES_KEY ].should == @info.event_codes.map{ |event_code| event_code.to_h }
+         @info_hash[ RCAP::CAP_1_1::Info::EVENT_CODES_KEY ].should == @info.event_codes.map{ |event_code| event_code.to_h }
        end
 
        it( 'should export the parameters ' ) do
-         @info_hash[ RCAP::Info::PARAMETERS_KEY ].should == @info.parameters.map{ |parameter| parameter.to_h }
+         @info_hash[ RCAP::CAP_1_1::Info::PARAMETERS_KEY ].should == @info.parameters.map{ |parameter| parameter.to_h }
        end
 
        it( 'should export the resources ' ) do
-         @info_hash[ RCAP::Info::RESOURCES_KEY ].should == @info.resources.map{ |resource| resource.to_h }  
+         @info_hash[ RCAP::CAP_1_1::Info::RESOURCES_KEY ].should == @info.resources.map{ |resource| resource.to_h }
        end
 
        it( 'should export the areas' ) do
-         @info_hash[ RCAP::Info::AREAS_KEY ].should == @info.areas.map{ |area| area.to_h }      
+         @info_hash[ RCAP::CAP_1_1::Info::AREAS_KEY ].should == @info.areas.map{ |area| area.to_h }
        end
     end
   end
+
+  describe( 'instance methods' ) do
+    before( :each ) do
+      @info = RCAP::CAP_1_1::Info.new
+    end
+
+    describe( '#add_event_code' ) do
+      before( :each ) do
+        @event_code = @info.add_event_code( name: 'Event Code', value: '1234' )
+      end
+
+      it( 'should return a 1.1 EventCode' ) do
+        @event_code.class.should == RCAP::CAP_1_1::EventCode
+        @event_code.name.should == 'Event Code'
+        @event_code.value.should == '1234'
+      end
+
+      it( 'should add an EventCode to the event_codes attribute' ) do
+        @info.event_codes.size.should == 1
+      end
+    end
+
+    describe( '#add_parameter' ) do
+      before( :each ) do
+        @parameter = @info.add_parameter( name: 'Parameter', value: '1234' )
+      end
+
+      it( 'should return a 1.1 Parameter' ) do
+        @parameter.class.should == RCAP::CAP_1_1::Parameter
+        @parameter.name.should == 'Parameter'
+        @parameter.value.should == '1234'
+      end
+
+      it( 'should add a Parameter to the parameters attribute' ) do
+        @info.parameters.size.should == 1
+      end
+    end
+
+    describe( '#add_resource' ) do
+      before( :each ) do
+        @resource = @info.add_resource( resource_desc: 'Resource' )
+      end
+
+      it( 'should return a 1.1 Resource' ) do
+        @resource.class.should == RCAP::CAP_1_1::Resource
+        @resource.resource_desc.should == 'Resource'
+      end
+
+      it( 'should add a Resource to the resources attribute' ) do
+        @info.resources.size.should == 1
+      end
+    end
+
+    describe( '#add_area' ) do
+      before( :each ) do
+        @area = @info.add_area( area_desc: 'Area' )
+      end
+
+      it( 'should return a 1.1 area' ) do
+        @area.class.should == RCAP::CAP_1_1::Area
+        @area.area_desc.should == 'Area'
+      end
+
+      it( 'should add a Area to the areas attribute' ) do
+        @info.areas.size.should == 1
+      end
+    end
+  end
 end