rcap 2.4.1 → 2.5.0

data/spec/cap_1_0/parameter_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe( RCAP::CAP_1_0::Parameter ) do
-  context( 'when initialised' ) do
-    context( 'from XML' ) do
-      before( :each ) do
+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 do |parameter|
           parameter.name = 'name'
           parameter.value = 'value'
@@ -11,74 +11,74 @@ describe( RCAP::CAP_1_0::Parameter ) do
         @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 )
-        @parameter_xml_element = RCAP.xpath_first( @info_xml_element, RCAP::CAP_1_0::Parameter::XPATH, RCAP::CAP_1_0::Alert::XMLNS )
-        @parameter = RCAP::CAP_1_0::Parameter.from_xml_element( @parameter_xml_element )
+        @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)
+        @parameter_xml_element = RCAP.xpath_first(@info_xml_element, RCAP::CAP_1_0::Parameter::XPATH, RCAP::CAP_1_0::Alert::XMLNS)
+        @parameter = RCAP::CAP_1_0::Parameter.from_xml_element(@parameter_xml_element)
       end
 
-      it( 'should parse into the correct class' ) do
+      it('should parse into the correct class') do
         @parameter.class.should == RCAP::CAP_1_0::Parameter
       end
 
-      it( 'should parse the name correctly' ) do
+      it('should parse the name correctly') do
         @parameter.name.should == @original_parameter.name
       end
 
-      it( 'should parse the value correctly' ) do
+      it('should parse the value correctly') do
         @parameter.value.should == @original_parameter.value
       end
     end
   end
 
-  context( 'when exported' ) do
-    before( :each ) do
+  context('when exported') do
+    before(:each) do
       @parameter = RCAP::CAP_1_0::Parameter.new do |parameter|
         parameter.name = 'name'
         parameter.value = 'value'
       end
     end
 
-    context( 'to a hash' ) do
-      it( 'should export correctly' ) do
+    context('to a hash') do
+      it('should export correctly') do
         @parameter.to_h.should == { 'name' => 'value' }
       end
     end
   end
 
-  describe( '.parse_parameter' ) do
-    it( 'should parse valid content correctly' ) do
-      RCAP::CAP_1_0::Parameter.parse_parameter( "name=value" ).should == { :name => 'name', :value => 'value' }
+  describe('.parse_parameter') do
+    it('should parse valid content correctly') do
+      RCAP::CAP_1_0::Parameter.parse_parameter('name=value').should == { name: 'name', value: 'value' }
     end
 
-    it( 'should parse invalid content correctly' ) do
-      RCAP::CAP_1_0::Parameter.parse_parameter( 'name' ).should == nil
+    it('should parse invalid content correctly') do
+      RCAP::CAP_1_0::Parameter.parse_parameter('name').should.nil?
     end
   end
 
-  describe( '.to_xml_element' ) do
-    before( :each ) do
+  describe('.to_xml_element') do
+    before(:each) do
       @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
+    it('should generate an XML element correctly') do
       @parameter.to_xml_element.text.should == 'name=value'
     end
   end
 
-  describe( '.from_xml_element' ) do
-    before( :each ) do
+  describe('.from_xml_element') do
+    before(:each) do
       @parameter = RCAP::CAP_1_0::Parameter.new do |parameter|
         parameter.name = 'name'
         parameter.value = 'value'
       end
     end
 
-    it( 'should initialise correctly' ) do
-      parameter = RCAP::CAP_1_0::Parameter.from_xml_element( @parameter.to_xml_element )
+    it('should initialise correctly') do
+      parameter = RCAP::CAP_1_0::Parameter.from_xml_element(@parameter.to_xml_element)
       parameter.name.should == @parameter.name
       parameter.value.should == @parameter.value
     end

data/spec/cap_1_0/point_spec.rb

@@ -1,51 +1,51 @@
 require 'spec_helper'
 
-describe( RCAP::CAP_1_0::Point ) do
-  describe( 'is not valid if' ) do
-    before( :each ) do
+describe(RCAP::CAP_1_0::Point) do
+  describe('is not valid if') do
+    before(:each) do
       @point = RCAP::CAP_1_0::Point.new do |point|
         point.lattitude = 0
         point.longitude = 0
       end
 
-      @point.should( be_valid )
+      @point.should(be_valid)
     end
 
-    it( 'does not have a longitude defined' ) do
+    it('does not have a longitude defined') do
       @point.longitude = nil
-      @point.should_not( be_valid )
+      @point.should_not(be_valid)
     end
 
-    it( 'does not have a valid longitude' ) do
+    it('does not have a valid longitude') do
       @point.longitude = RCAP::CAP_1_0::Point::MAX_LONGITUDE + 1
-      @point.should_not( be_valid )
+      @point.should_not(be_valid)
       @point.longitude = RCAP::CAP_1_0::Point::MIN_LONGITUDE - 1
-      @point.should_not( be_valid )
+      @point.should_not(be_valid)
     end
 
-    it( 'does not have a lattitude defined' ) do
+    it('does not have a lattitude defined') do
       @point.lattitude = nil
-      @point.should_not( be_valid )
+      @point.should_not(be_valid)
     end
 
-    it( 'does not have a valid lattitude' ) do
+    it('does not have a valid lattitude') do
       @point.lattitude = RCAP::CAP_1_0::Point::MAX_LATTITUDE + 1
-      @point.should_not( be_valid )
+      @point.should_not(be_valid)
       @point.lattitude = RCAP::CAP_1_0::Point::MIN_LATTITUDE - 1
-      @point.should_not( be_valid )
+      @point.should_not(be_valid)
     end
   end
 
-  context( 'when exported' ) do
-    before( :each ) do
+  context('when exported') do
+    before(:each) do
       @point = RCAP::CAP_1_0::Point.new do |p|
         p.lattitude = 1
         p.longitude = 1
       end
     end
 
-    context( 'to hash' ) do
-      it( 'should export correctly' ) do
+    context('to hash') do
+      it('should export correctly') do
         @point.to_h.should == { RCAP::CAP_1_0::Point::LATTITUDE_KEY => 1, RCAP::CAP_1_0::Point::LONGITUDE_KEY => 1 }
       end
     end

data/spec/cap_1_0/polygon_spec.rb

@@ -1,33 +1,33 @@
 require 'spec_helper'
 
-describe( RCAP::CAP_1_0::Polygon ) do
-  describe( 'is not valid if it' ) do
-    before( :each ) do
+describe(RCAP::CAP_1_0::Polygon) do
+  describe('is not valid if it') do
+    before(:each) do
       @polygon = RCAP::CAP_1_0::Polygon.new do |polygon|
-        [1,2,1].each do |i|
+        [1, 2, 1].each do |i|
           polygon.add_point do |point|
             point.lattitude = i
             point.longitude = i
           end
         end
       end
-      @polygon.should( be_valid )
+      @polygon.should(be_valid)
     end
 
-    it( 'does not have any points' ) do
+    it('does not have any points') do
       @polygon.points.clear
-      @polygon.should_not( be_valid )
+      @polygon.should_not(be_valid)
     end
 
-    it( 'does not have a valid collection of points' ) do
+    it('does not have a valid collection of points') do
       @polygon.points.first.lattitude = nil
-      @polygon.should_not( be_valid )
+      @polygon.should_not(be_valid)
     end
   end
 
-  context( 'on initialization' ) do
-    context( 'from XML' ) do
-      before( :each ) do
+  context('on initialization') do
+    context('from XML') do
+      before(:each) do
         @original_polygon = RCAP::CAP_1_0::Polygon.new do |polygon|
           3.times do |i|
             polygon.add_point do |point|
@@ -36,11 +36,11 @@ describe( RCAP::CAP_1_0::Polygon ) do
             end
           end
         end
-        @empty_original_polygon = RCAP::CAP_1_0::Polygon.new()
+        @empty_original_polygon = RCAP::CAP_1_0::Polygon.new
         @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|
+            [@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|
@@ -54,29 +54,29 @@ describe( RCAP::CAP_1_0::Polygon ) do
         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 )
-        @area_element = RCAP.xpath_first( @info_element, RCAP::CAP_1_0::Area::XPATH, RCAP::CAP_1_0::Alert::XMLNS )
-        @polygon_element = RCAP.xpath_first( @area_element, RCAP::CAP_1_0::Polygon::XPATH, RCAP::CAP_1_0::Alert::XMLNS )
-        @polygon = RCAP::CAP_1_0::Polygon.from_xml_element( @polygon_element )
+        @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)
+        @area_element = RCAP.xpath_first(@info_element, RCAP::CAP_1_0::Area::XPATH, RCAP::CAP_1_0::Alert::XMLNS)
+        @polygon_element = RCAP.xpath_first(@area_element, RCAP::CAP_1_0::Polygon::XPATH, RCAP::CAP_1_0::Alert::XMLNS)
+        @polygon = RCAP::CAP_1_0::Polygon.from_xml_element(@polygon_element)
       end
 
-      it( 'should parse all the points' ) do
-        @polygon.points.zip( @original_polygon.points ).each do |point, original_point|
+      it('should parse all the points') do
+        @polygon.points.zip(@original_polygon.points).each do |point, original_point|
           point.lattitude.should == original_point.lattitude
           point.longitude.should == original_point.longitude
         end
       end
 
       it 'should allow empty polygon xml elements' do
-        empty_polygon_element = RCAP.xpath_match( @area_element, RCAP::CAP_1_0::Polygon::XPATH, RCAP::CAP_1_0::Alert::XMLNS )[1]
-        empty_polygon = RCAP::CAP_1_0::Polygon.from_xml_element( empty_polygon_element )
+        empty_polygon_element = RCAP.xpath_match(@area_element, RCAP::CAP_1_0::Polygon::XPATH, RCAP::CAP_1_0::Alert::XMLNS)[1]
+        empty_polygon = RCAP::CAP_1_0::Polygon.from_xml_element(empty_polygon_element)
         empty_polygon.should == @empty_original_polygon
       end
     end
 
-    context( 'from a hash' ) do
-      before( :each ) do
+    context('from a hash') do
+      before(:each) do
         @polygon = RCAP::CAP_1_0::Polygon.new do |polygon|
           3.times do |i|
             polygon.add_point do |point|
@@ -87,15 +87,15 @@ describe( RCAP::CAP_1_0::Polygon ) do
         end
       end
 
-      it( 'should load all the points' ) do
-        @new_polygon = RCAP::CAP_1_0::Polygon.from_h( @polygon.to_h )
+      it('should load all the points') do
+        @new_polygon = RCAP::CAP_1_0::Polygon.from_h(@polygon.to_h)
         @new_polygon.points.should == @polygon.points
       end
     end
   end
 
-  context( 'when exported' ) do
-    before( :each ) do
+  context('when exported') do
+    before(:each) do
       @polygon = RCAP::CAP_1_0::Polygon.new do |polygon|
         3.times do |i|
           polygon.add_point do |point|
@@ -106,33 +106,33 @@ describe( RCAP::CAP_1_0::Polygon ) do
       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_a }}
+    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_a } }
       end
     end
   end
 
-  describe( 'instance methods' ) do
-    before( :each ) do
+  describe('instance methods') do
+    before(:each) do
       @polygon = RCAP::CAP_1_0::Polygon.new
     end
 
-    describe( '#add_point' ) do
-      before( :each ) do
+    describe('#add_point') do
+      before(:each) do
         @point = @polygon.add_point do |polygon|
           polygon.lattitude = 1
           polygon.longitude = 1
         end
       end
 
-      it( 'should return a 1.0 Point' ) do
+      it('should return a 1.0 Point') do
         @point.class.should == RCAP::CAP_1_0::Point
         @point.lattitude.should == 1
         @point.longitude.should == 1
       end
 
-      it( 'should add a Point to the points attribute' ) do
+      it('should add a Point to the points attribute') do
         @polygon.points.size.should == 1
       end
     end

data/spec/cap_1_0/resource_spec.rb

@@ -1,152 +1,151 @@
 require 'spec_helper'
 
-describe( RCAP::CAP_1_0::Resource ) do
-  context( 'on initialisation' ) do
-    before( :each ) do
+describe(RCAP::CAP_1_0::Resource) do
+  context('on initialisation') do
+    before(:each) do
       @resource = RCAP::CAP_1_0::Resource.new
     end
 
-    it( 'should have no mime_type' ){     @resource.mime_type.should( be_nil )}
-    it( 'should have no size' ){          @resource.size.should( be_nil )}
-    it( 'should have no uri' ){           @resource.uri.should( be_nil )}
-    it( 'should have no digest' ){        @resource.digest.should( be_nil )}
-    it( 'should have no resource_desc' ){ @resource.resource_desc.should( be_nil )}
+    it('should have no mime_type') {     @resource.mime_type.should(be_nil) }
+    it('should have no size') {          @resource.size.should(be_nil) }
+    it('should have no uri') {           @resource.uri.should(be_nil) }
+    it('should have no digest') {        @resource.digest.should(be_nil) }
+    it('should have no resource_desc') { @resource.resource_desc.should(be_nil) }
 
-    context( 'from XML' ) do
-      before( :each ) do
+    context('from XML') do
+      before(:each) do
         @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.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.size          = 20_480
+          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 )
-        @resource_element = RCAP.xpath_first( @info_element, RCAP::CAP_1_0::Resource::XPATH, RCAP::CAP_1_0::Alert::XMLNS )
-        @resource_element.should_not( be_nil )
-        @resource = RCAP::CAP_1_0::Resource.from_xml_element( @resource_element )
+        @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)
+        @resource_element = RCAP.xpath_first(@info_element, RCAP::CAP_1_0::Resource::XPATH, RCAP::CAP_1_0::Alert::XMLNS)
+        @resource_element.should_not(be_nil)
+        @resource = RCAP::CAP_1_0::Resource.from_xml_element(@resource_element)
       end
 
-      it( 'should parse resource_desc correctly' ) do
+      it('should parse resource_desc correctly') do
         @resource.resource_desc.should == @original_resource.resource_desc
       end
 
-      it( 'should parse uri correctly' ) do
+      it('should parse uri correctly') do
         @resource.uri.should == @original_resource.uri
       end
 
-      it( 'should parse mime_type correctly' ) do
+      it('should parse mime_type correctly') do
         @resource.mime_type.should == @original_resource.mime_type
       end
 
-      it( 'should parse size correctly' ) do
+      it('should parse size correctly') do
         @resource.size.should == @original_resource.size
       end
 
-      it( 'should parse digest correctly' ) do
+      it('should parse digest correctly') do
         @resource.digest.should == @original_resource.digest
       end
     end
 
-
-    context( 'from a hash' ) do
-      before( :each ) do
+    context('from a hash') do
+      before(:each) do
         @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.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.size          = 20_480
+          resource.digest        = '2048'
         end
 
-        @resource = RCAP::CAP_1_0::Resource.from_h( @original_resource.to_h )
+        @resource = RCAP::CAP_1_0::Resource.from_h(@original_resource.to_h)
       end
 
-      it( 'should parse resource_desc correctly' ) do
+      it('should parse resource_desc correctly') do
         @resource.resource_desc.should == @original_resource.resource_desc
       end
 
-      it( 'should parse uri correctly' ) do
+      it('should parse uri correctly') do
         @resource.uri.should == @original_resource.uri
       end
 
-      it( 'should parse mime_type correctly' ) do
+      it('should parse mime_type correctly') do
         @resource.mime_type.should == @original_resource.mime_type
       end
 
-      it( 'should parse size correctly' ) do
+      it('should parse size correctly') do
         @resource.size.should == @original_resource.size
       end
 
-      it( 'should parse digest correctly' ) do
+      it('should parse digest correctly') do
         @resource.digest.should == @original_resource.digest
       end
     end
 
   end
 
-  context( 'when exported' ) do
-    before( :each ) do
+  context('when exported') do
+    before(:each) do
       @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.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.size          = 20_480
+        resource.digest        = '2048'
       end
     end
 
-    context( 'to a hash' ) do
-      before( :each ) do
+    context('to a hash') do
+      before(:each) do
         @resource_hash = @resource.to_h
       end
 
-      it( 'should set the resource description' ) do
-        @resource_hash[ RCAP::CAP_1_0::Resource::RESOURCE_DESC_KEY ].should == @resource.resource_desc
+      it('should set the resource description') do
+        @resource_hash[ RCAP::CAP_1_0::Resource::RESOURCE_DESC_KEY].should == @resource.resource_desc
       end
 
-      it( 'should set the mime type' ) do
-        @resource_hash[ RCAP::CAP_1_0::Resource::MIME_TYPE_KEY ].should == @resource.mime_type
+      it('should set the mime type') do
+        @resource_hash[ RCAP::CAP_1_0::Resource::MIME_TYPE_KEY].should == @resource.mime_type
       end
 
-      it( 'should set the size' ) do
-        @resource_hash[ RCAP::CAP_1_0::Resource::SIZE_KEY ].should == @resource.size
+      it('should set the size') do
+        @resource_hash[ RCAP::CAP_1_0::Resource::SIZE_KEY].should == @resource.size
       end
 
-      it( 'should set the URI' ) do
-        @resource_hash[ RCAP::CAP_1_0::Resource::URI_KEY ].should == @resource.uri
+      it('should set the URI') do
+        @resource_hash[ RCAP::CAP_1_0::Resource::URI_KEY].should == @resource.uri
       end
 
-      it( 'should set the digest' ) do
-        @resource_hash[ RCAP::CAP_1_0::Resource::DIGEST_KEY ].should == @resource.digest
+      it('should set the digest') do
+        @resource_hash[ RCAP::CAP_1_0::Resource::DIGEST_KEY].should == @resource.digest
       end
     end
 
-    context( 'to xml' ) do
-      it( 'should be successful' ) do
-        lambda{ @resource_xml = @resource.to_xml }.should_not( raise_exception )
+    context('to xml') do
+      it('should be successful') do
+        lambda { @resource_xml = @resource.to_xml }.should_not(raise_exception)
       end
     end
   end
 
-  context( 'which is valid' ) do
-    before( :each ) do
+  context('which is valid') do
+    before(:each) do
       @resource = RCAP::CAP_1_0::Resource.new do |resource|
         resource.resource_desc = 'Resource Description'
       end
 
-      @resource.should( be_valid )
+      @resource.should(be_valid)
     end
 
-    describe( 'should not be valid if it' ) do
-      it( 'does not have a resource description (resource_desc)' ) do
+    describe('should not be valid if it') do
+      it('does not have a resource description (resource_desc)') do
         @resource.resource_desc = nil
-        @resource.should_not( be_valid )
+        @resource.should_not(be_valid)
       end
     end
   end