rcap 1.2.4 → 1.3.0

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 = Change Log
 
+=== 1.3.0 - 15 December 2011
+
+* Removed Resource#deref_uri= in 1.1 and 1.2 API. 
+* Added Resource#calculate_size_and_hash to calculate size and SHA1 hash of deref_uri if present
+* Hash and size of referenced URI are only calculated on an explicit call to Resource#dereference_uri!
+
 === 1.2.4 - 4 December 2011
 
 * Fixed parsing bug when creating Parameter and subclasses from XML

data/README.rdoc

@@ -8,7 +8,7 @@ RCAP currently supports CAP 1.0, 1.1 and 1.2.
 
 == Version
 
-1.2.3
+1.3.0
 
 == Dependencies
 
@@ -120,7 +120,7 @@ Will produce the following output:
 
 All RCAP classes include the Validation module.
 
-A full spec suite using {RSpec}[http://www.rspec.info] was used to test the validations and currently numbers over 600 tests.
+A full spec suite using {RSpec}[http://www.rspec.info] was used to test the validations and currently numbers over 1000 tests.
 
 === Exporting an Alert
 

data/lib/rcap/cap_1_1/resource.rb

@@ -14,7 +14,7 @@ module RCAP
       # Resource location
       attr_accessor( :uri )
       # Dereferenced URI - contents of URI Base64 encoded
-      attr_reader( :deref_uri )
+      attr_accessor( :deref_uri )
       # SHA-1 hash of contents of resource
       attr_accessor( :digest )
 
@@ -77,13 +77,6 @@ module RCAP
         self.resource_desc
       end
 
-      # Sets the deref_uri. The SHA digest and size are also calculated and set.
-      def deref_uri=( value )
-        @deref_uri = value
-        self.digest = Digest::SHA1.hexdigest( @deref_uri )
-        self.size = @deref_uri.bytesize
-      end
-
       # Retrieves the content at uri and stores it in deref_uri as Base64 encoded text. It will also
       # calculate the digest on the encoded data using SHA1 and set the size.
       #
@@ -91,7 +84,15 @@ module RCAP
       # to open and read the content.
       def dereference_uri!
         content = URI.parse( self.uri ).read
-        self.deref_uri = Base64.encode64( content )
+        @deref_uri = Base64.encode64( content )
+        self.calculate_hash_and_size
+      end
+
+      def calculate_hash_and_size
+        if @deref_uri
+          @digest = Digest::SHA1.hexdigest( @deref_uri )
+          @size = @deref_uri.bytesize
+        end
       end
 
       def self.from_xml_element( resource_xml_element ) # :nodoc:

data/lib/rcap/cap_1_2/resource.rb

@@ -15,7 +15,7 @@ module RCAP
       # Resource location
       attr_accessor( :uri )
       # Dereferenced URI - contents of URI Base64 encoded
-      attr_reader( :deref_uri )
+      attr_accessor( :deref_uri )
       # SHA-1 hash of contents of resource
       attr_accessor( :digest )
 
@@ -79,13 +79,6 @@ module RCAP
         self.resource_desc
       end
 
-      # Sets the deref_uri. The SHA digest and size are also calculated and set.
-      def deref_uri=( value )
-        @deref_uri = value
-        self.digest = Digest::SHA1.hexdigest( @deref_uri )
-        self.size = @deref_uri.bytesize
-      end
-
       # Retrieves the content at uri and stores it in deref_uri as Base64 encoded text. It will also
       # calculate the digest on the encoded data using SHA1 and set the size.
       #
@@ -93,7 +86,15 @@ module RCAP
       # to open and read the content.
       def dereference_uri!
         content = URI.parse( self.uri ).read
-        self.deref_uri = Base64.encode64( content )
+        @deref_uri = Base64.encode64( content )
+        self.calculate_hash_and_size
+      end
+
+      def calculate_hash_and_size
+        if @deref_uri
+          @digest = Digest::SHA1.hexdigest( @deref_uri )
+          @size = @deref_uri.bytesize
+        end
       end
 
       def self.from_xml_element( resource_xml_element ) # :nodoc:

data/lib/rcap/version.rb

@@ -1,3 +1,3 @@
 module RCAP
-  VERSION = '1.2.4'
+  VERSION = '1.3.0'
 end

data/spec/cap_1_1/resource_spec.rb

@@ -182,4 +182,22 @@ describe( RCAP::CAP_1_1::Resource ) do
       end
     end
   end
+
+  context( 'with a dereferenced URI' ) do
+    before( :each ) do 
+      @content = "1,2\n3,4"
+      @encoded_content = Base64.encode64( @content )
+      @resource = RCAP::CAP_1_1::Resource.new( :resource_desc => 'Resource Description', :mime_type => 'text/csv', :uri => 'http://tempuri.org/resource.csv', :deref_uri => @encoded_content )
+    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 )))
+      end
+
+      it( 'should set the size in bytes' ) do
+        lambda{ @resource.calculate_hash_and_size }.should( change( @resource, :size ).to( @encoded_content.bytesize ))
+      end
+    end
+  end
 end

data/spec/cap_1_2/resource_spec.rb

@@ -187,4 +187,22 @@ describe( RCAP::CAP_1_2::Resource ) do
       end
     end
   end
+
+  context( 'with a dereferenced URI' ) do
+    before( :each ) do 
+      @content = "1,2\n3,4"
+      @encoded_content = Base64.encode64( @content )
+      @resource = RCAP::CAP_1_1::Resource.new( :resource_desc => 'Resource Description', :mime_type => 'text/csv', :uri => 'http://tempuri.org/resource.csv', :deref_uri => @encoded_content )
+    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 )))
+      end
+
+      it( 'should set the size in bytes' ) do
+        lambda{ @resource.calculate_hash_and_size }.should( change( @resource, :size ).to( @encoded_content.bytesize ))
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rcap
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 4
-  version: 1.2.4
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Farrel Lifson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-03 00:00:00 Z
+date: 2011-12-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assistance