rcap 2.4.1 → 2.7.3

data/spec/cap_1_1/parameter_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe( RCAP::CAP_1_1::Parameter ) do
-  context( 'when initialised' ) do
-    context( 'from XML' ) do
-      before( :each ) do
+describe(RCAP::CAP_1_1::Parameter) do
+  context('when initialised') do
+    context('from XML') do
+      before(:each) do
 
         @alert = RCAP::CAP_1_1::Alert.new do |alert|
           alert.add_info.add_parameter do |parameter|
@@ -13,36 +13,36 @@ describe( RCAP::CAP_1_1::Parameter ) do
         end
         @original_parameter  = @alert.infos.first.parameters.first
         @xml_string = @alert.to_xml
-        @xml_document = REXML::Document.new( @xml_string )
-        @info_xml_element = RCAP.xpath_first( @xml_document.root, RCAP::CAP_1_1::Info::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
-        @parameter_xml_element = RCAP.xpath_first( @info_xml_element, RCAP::CAP_1_1::Parameter::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
-        @parameter = RCAP::CAP_1_1::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_1::Info::XPATH, RCAP::CAP_1_1::Alert::XMLNS)
+        @parameter_xml_element = RCAP.xpath_first(@info_xml_element, RCAP::CAP_1_1::Parameter::XPATH, RCAP::CAP_1_1::Alert::XMLNS)
+        @parameter = RCAP::CAP_1_1::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_1::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_1::Parameter.new do |parameter|
-         parameter.name  = 'name'
-         parameter.value = 'value'
+        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

data/spec/cap_1_1/point_spec.rb

@@ -1,50 +1,50 @@
 require 'spec_helper'
 
-describe( RCAP::CAP_1_1::Point ) do
-  describe( 'is not valid if' ) do
-    before( :each ) do
+describe(RCAP::CAP_1_1::Point) do
+  describe('is not valid if') do
+    before(:each) do
       @point = RCAP::CAP_1_1::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_1::Point::MAX_LONGITUDE + 1
-      @point.should_not( be_valid )
+      @point.should_not(be_valid)
       @point.longitude = RCAP::CAP_1_1::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_1::Point::MAX_LATTITUDE + 1
-      @point.should_not( be_valid )
+      @point.should_not(be_valid)
       @point.lattitude = RCAP::CAP_1_1::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_1::Point.new do |point|
         point.lattitude = 1
         point.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_1::Point::LATTITUDE_KEY => 1, RCAP::CAP_1_1::Point::LONGITUDE_KEY => 1 }
       end
     end

data/spec/cap_1_1/polygon_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe( RCAP::CAP_1_1::Polygon ) do
-  describe( 'is not valid if it' ) do
-    before( :each ) do
+describe(RCAP::CAP_1_1::Polygon) do
+  describe('is not valid if it') do
+    before(:each) do
       @polygon = RCAP::CAP_1_1::Polygon.new do |polygon|
         3.times do
           polygon.add_point do |point|
@@ -10,24 +10,19 @@ describe( RCAP::CAP_1_1::Polygon ) do
             point.longitude = 0
           end
         end
-        @polygon.should( be_valid )
-      end
-
-      it( 'does not have any points' ) do
-        @polygon.points.clear
-        @polygon.should_not( be_valid )
       end
+      @polygon.should(be_valid)
+    end
 
-      it( 'does not have a valid collection of points' ) do
-        @polygon.points.first.lattitude = nil
-        @polygon.should_not( be_valid )
-      end
+    it('does not have a valid collection of points') do
+      @polygon.points.first.lattitude = nil
+      @polygon.should_not(be_valid)
     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_1::Polygon.new do |polygon|
           3.times do |i|
             polygon.add_point do |point|
@@ -36,7 +31,7 @@ describe( RCAP::CAP_1_1::Polygon ) do
             end
           end
         end
-        @empty_original_polygon = RCAP::CAP_1_1::Polygon.new()
+        @empty_original_polygon = RCAP::CAP_1_1::Polygon.new
         @alert = RCAP::CAP_1_1::Alert.new
         @alert.add_info.add_area do |area|
           area.add_polygon do |polygon|
@@ -50,29 +45,29 @@ describe( RCAP::CAP_1_1::Polygon ) do
           area.add_polygon
         end
         @xml_string = @alert.to_xml
-        @xml_document = REXML::Document.new( @xml_string )
-        @info_element = RCAP.xpath_first( @xml_document.root, RCAP::CAP_1_1::Info::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
-        @area_element = RCAP.xpath_first( @info_element, RCAP::CAP_1_1::Area::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
-        @polygon_element = RCAP.xpath_first( @area_element, RCAP::CAP_1_1::Polygon::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
-        @polygon = RCAP::CAP_1_1::Polygon.from_xml_element( @polygon_element )
+        @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)
+        @polygon_element = RCAP.xpath_first(@area_element, RCAP::CAP_1_1::Polygon::XPATH, RCAP::CAP_1_1::Alert::XMLNS)
+        @polygon = RCAP::CAP_1_1::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_1::Polygon::XPATH, RCAP::CAP_1_1::Alert::XMLNS )[1]
-        empty_polygon = RCAP::CAP_1_1::Polygon.from_xml_element( empty_polygon_element )
+        empty_polygon_element = RCAP.xpath_match(@area_element, RCAP::CAP_1_1::Polygon::XPATH, RCAP::CAP_1_1::Alert::XMLNS)[1]
+        empty_polygon = RCAP::CAP_1_1::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_1::Polygon.new do |polygon|
           3.times do |i|
             polygon.add_point do |point|
@@ -83,15 +78,15 @@ describe( RCAP::CAP_1_1::Polygon ) do
         end
       end
 
-      it( 'should load all the points' ) do
-        @new_polygon = RCAP::CAP_1_1::Polygon.from_h( @polygon.to_h )
+      it('should load all the points') do
+        @new_polygon = RCAP::CAP_1_1::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_1::Polygon.new do |polygon|
         3.times do |i|
           polygon.add_point do |point|
@@ -102,33 +97,40 @@ describe( RCAP::CAP_1_1::Polygon ) do
       end
     end
 
-    context( 'to a hash' ) do
-      it( 'should export correctly' ) do
-        @polygon.to_h.should == { RCAP::CAP_1_1::Polygon::POINTS_KEY => @polygon.points.map{ |point| point.to_a }}
+    context('to geojson') do
+      it('should be valid geojson') do
+        expected = '{"type":"Polygon","coordinates":[[[0,0],[1,1],[2,2]]]}'
+        expect(@polygon.to_geojson).to eq expected
+      end
+    end
+
+    context('to a hash') do
+      it('should export correctly') do
+        @polygon.to_h.should == { RCAP::CAP_1_1::Polygon::POINTS_KEY => @polygon.points.map { |point| point.to_a } }
       end
     end
   end
 
-  describe( 'instance methods' ) do
-    before( :each ) do
+  describe('instance methods') do
+    before(:each) do
       @polygon = RCAP::CAP_1_1::Polygon.new
     end
 
-    describe( '#add_point' ) do
-      before( :each ) do
+    describe('#add_point') do
+      before(:each) do
         @point = @polygon.add_point do |point|
           point.lattitude = 1
           point.longitude = 1
         end
       end
 
-      it( 'should return a 1.1 Point' ) do
+      it('should return a 1.1 Point') do
         @point.class.should == RCAP::CAP_1_1::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_1/resource_spec.rb

@@ -1,237 +1,236 @@
 require 'spec_helper'
 
-describe( RCAP::CAP_1_1::Resource ) do
-  context( 'on initialisation' ) do
-    before( :each ) do
+describe(RCAP::CAP_1_1::Resource) do
+  context('on initialisation') do
+    before(:each) do
       @resource = RCAP::CAP_1_1::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 deref_uri' ){     @resource.deref_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 deref_uri') {     @resource.deref_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
         @alert = RCAP::CAP_1_1::Alert.new
         @alert.add_info.add_resource 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.deref_uri     = "IMAGE DATA"
-          resource.size          = 20480
-          resource.digest        = "2048"
+          resource.deref_uri     = 'IMAGE DATA'
+          resource.size          = 20_480
+          resource.digest        = '2048'
         end
         @original_resource = @alert.infos.first.resources.first
         @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 )
-        @resource_element = RCAP.xpath_first( @info_element, RCAP::CAP_1_1::Resource::XPATH, RCAP::CAP_1_1::Alert::XMLNS )
-        @resource_element.should_not( be_nil )
-        @resource = RCAP::CAP_1_1::Resource.from_xml_element( @resource_element )
+        @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)
+        @resource_element = RCAP.xpath_first(@info_element, RCAP::CAP_1_1::Resource::XPATH, RCAP::CAP_1_1::Alert::XMLNS)
+        @resource_element.should_not(be_nil)
+        @resource = RCAP::CAP_1_1::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 deref_uri correctly' ) do
+      it('should parse deref_uri correctly') do
         @resource.deref_uri.should == @original_resource.deref_uri
       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_1::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.deref_uri     = "IMAGE DATA"
-          resource.size          = 20480
-          resource.digest        = "2048"
+          resource.deref_uri     = 'IMAGE DATA'
+          resource.size          = 20_480
+          resource.digest        = '2048'
         end
 
-        @resource = RCAP::CAP_1_1::Resource.from_h( @original_resource.to_h )
+        @resource = RCAP::CAP_1_1::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 deref_uri correctly' ) do
+      it('should parse deref_uri correctly') do
         @resource.deref_uri.should == @original_resource.deref_uri
       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 YAML' ) do
-      before( :each ) do
+    context('from YAML') do
+      before(:each) do
         @original_resource = RCAP::CAP_1_1::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.deref_uri     = "IMAGE DATA"
-          resource.size          = 20480
-          resource.digest        = "2048"
+          resource.deref_uri     = 'IMAGE DATA'
+          resource.size          = 20_480
+          resource.digest        = '2048'
         end
-        @resource = RCAP::CAP_1_1::Resource.from_yaml_data( YAML.load( @original_resource.to_yaml ))
+        @resource = RCAP::CAP_1_1::Resource.from_yaml_data(YAML.load(@original_resource.to_yaml))
       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 deref_uri correctly' ) do
+      it('should parse deref_uri correctly') do
         @resource.deref_uri.should == @original_resource.deref_uri
       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_1::Resource.new
-      @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.deref_uri     = "IMAGE DATA"
-      @resource.size          = 20480
-      @resource.digest        = "2048"
+      @resource.deref_uri     = 'IMAGE DATA'
+      @resource.size          = 20_480
+      @resource.digest        = '2048'
     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_1::Resource::RESOURCE_DESC_KEY ].should == @resource.resource_desc
+      it('should set the resource description') do
+        @resource_hash[ RCAP::CAP_1_1::Resource::RESOURCE_DESC_KEY].should == @resource.resource_desc
       end
 
-      it( 'should set the mime type' ) do
-        @resource_hash[ RCAP::CAP_1_1::Resource::MIME_TYPE_KEY ].should == @resource.mime_type
+      it('should set the mime type') do
+        @resource_hash[ RCAP::CAP_1_1::Resource::MIME_TYPE_KEY].should == @resource.mime_type
       end
 
-      it( 'should set the size' ) do
-        @resource_hash[ RCAP::CAP_1_1::Resource::SIZE_KEY ].should == @resource.size
+      it('should set the size') do
+        @resource_hash[ RCAP::CAP_1_1::Resource::SIZE_KEY].should == @resource.size
       end
 
-      it( 'should set the URI' ) do
-        @resource_hash[ RCAP::CAP_1_1::Resource::URI_KEY ].should == @resource.uri
+      it('should set the URI') do
+        @resource_hash[ RCAP::CAP_1_1::Resource::URI_KEY].should == @resource.uri
       end
 
-      it( 'should set the dereferenced URI' ) do
-        @resource_hash[ RCAP::CAP_1_1::Resource::DEREF_URI_KEY ].should == @resource.deref_uri
+      it('should set the dereferenced URI') do
+        @resource_hash[ RCAP::CAP_1_1::Resource::DEREF_URI_KEY].should == @resource.deref_uri
       end
 
-      it( 'should set the digest' ) do
-        @resource_hash[ RCAP::CAP_1_1::Resource::DIGEST_KEY ].should == @resource.digest
+      it('should set the digest') do
+        @resource_hash[ RCAP::CAP_1_1::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_1::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
 
-  context( 'with a non-rereferenced URI' ) do
-    before( :each ) do
+  context('with a non-rereferenced URI') do
+    before(:each) do
       @resource = RCAP::CAP_1_1::Resource.new do |resource|
         resource.resource_desc = 'Resource Description'
         resource.mime_type     = 'text/csv'
         resource.uri           = 'http://tempuri.org/resource.csv'
       end
       @content = "1,2\n3,4"
-      @encoded_content = Base64.encode64( @content )
-      stub_request( :get, @resource.uri ).to_return( :status => 200, :body => @content )
+      @encoded_content = Base64.encode64(@content)
+      expect(URI).to receive(:parse) { StringIO.new(@content) }
     end
 
-    describe( '#dereference_uri!' ) do
-      it( 'should fetch the content and store it in deref_uri as Base64 encoded content' ) do
-        lambda{ @resource.dereference_uri! }.should( change( @resource, :deref_uri ).to( @encoded_content ))
+    describe('#dereference_uri!') do
+      it('should fetch the content and store it in deref_uri as Base64 encoded content') do
+        lambda { @resource.dereference_uri! }.should(change(@resource, :deref_uri).to(@encoded_content))
       end
 
-      it( 'should generate the correct SHA1 hash' ) do
-        lambda{ @resource.dereference_uri! }.should( change( @resource, :digest ).to( Digest::SHA1.hexdigest( @encoded_content )))
+      it('should generate the correct SHA1 hash') do
+        lambda { @resource.dereference_uri! }.should(change(@resource, :digest).to(Digest::SHA1.hexdigest(@encoded_content)))
       end
 
-      it( 'should set the size in bytes' ) do
-        lambda{ @resource.dereference_uri! }.should( change( @resource, :size ).to( @encoded_content.bytesize ))
+      it('should set the size in bytes') do
+        lambda { @resource.dereference_uri! }.should(change(@resource, :size).to(@encoded_content.bytesize))
       end
     end
   end
 
-  context( 'with a dereferenced URI' ) do
-    before( :each ) do
+  context('with a dereferenced URI') do
+    before(:each) do
       @content = "1,2\n3,4"
-      @encoded_content = Base64.encode64( @content )
+      @encoded_content = Base64.encode64(@content)
       @resource = RCAP::CAP_1_1::Resource.new do |resource|
         resource.resource_desc = 'Resource Description'
         resource.mime_type     = 'text/csv'
@@ -240,18 +239,18 @@ describe( RCAP::CAP_1_1::Resource ) do
       end
     end
 
-    describe( '#calculate_hash_and_size' ) do
-      it( 'should generate the correct SHA1 hash' ) do
-        lambda{ @resource.calculate_hash_and_size }.should( change( @resource, :digest ).to( Digest::SHA1.hexdigest( @encoded_content )))
+    describe('#calculate_hash_and_size') do
+      it('should generate the correct SHA1 hash') do
+        lambda { @resource.calculate_hash_and_size }.should(change(@resource, :digest).to(Digest::SHA1.hexdigest(@encoded_content)))
       end
 
-      it( 'should set the size in bytes' ) do
-        lambda{ @resource.calculate_hash_and_size }.should( change( @resource, :size ).to( @encoded_content.bytesize ))
+      it('should set the size in bytes') do
+        lambda { @resource.calculate_hash_and_size }.should(change(@resource, :size).to(@encoded_content.bytesize))
       end
     end
 
-    describe( '#decoded_deref_uri' ) do
-      it( 'should return the original content' ) do
+    describe('#decoded_deref_uri') do
+      it('should return the original content') do
         @resource.decoded_deref_uri.should == @content
       end
     end