symmetric-encryption 0.6.1 → 0.7.0

data/lib/symmetric_encryption/reader.rb

@@ -223,6 +223,50 @@ module SymmetricEncryption
       read_header
     end
 
+    # Seeks to a given offset (Integer) in the stream according to the value of whence:
+    #  IO::SEEK_CUR  | Seeks to _amount_ plus current position
+    #  --------------+----------------------------------------------------
+    #  IO::SEEK_END  | Seeks to _amount_ plus end of stream (you probably
+    #                | want a negative value for _amount_)
+    #  --------------+----------------------------------------------------
+    #  IO::SEEK_SET  | Seeks to the absolute location given by _amount_
+    #
+    # WARNING: IO::SEEK_SET will jump to the beginning of the file and
+    #          then re-read upto the point specified
+    # WARNING: IO::SEEK_END will read the entire file and then again
+    #          upto the point specified
+    def seek(amount, whence=IO::SEEK_SET)
+      offset = 0
+      case whence
+      when IO::SEEK_SET
+        offset = amount
+        rewind
+      when IO::SEEK_CUR
+        if amount >= 0
+          offset = amount
+        else
+          offset = @pos + amount
+          rewind
+        end
+      when IO::SEEK_END
+        rewind
+        # Read and decrypt entire file a block at a time to get its total
+        # unencrypted size
+        size = 0
+        while !eof
+          read_block
+          size += @read_buffer.size
+          @read_buffer = ''
+        end
+        rewind
+        offset = size + amount
+      else
+        raise "unknown whence:#{whence} supplied to seek()"
+      end
+      read(offset) if offset > 0
+      0
+    end
+
     private
 
     # Read the header from the file if present

data/lib/symmetric_encryption/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module SymmetricEncryption #:nodoc
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/lib/symmetric_encryption/writer.rb

@@ -29,7 +29,7 @@ module SymmetricEncryption
     #          The header contains:
     #             Version of the encryption key used to encrypt the file
     #             Indicator if the data was compressed
-    #          Default: false
+    #          Default: true
     #
     #     :version
     #          Version of the encryption key to use when encrypting
@@ -82,7 +82,7 @@ module SymmetricEncryption
     # Encrypt data before writing to the supplied stream
     def initialize(ios,options={})
       @ios      = ios
-      header    = options.fetch(:header, false)
+      header    = options.fetch(:header, true)
       # Compress is only used at this point for setting the flag in the header
       @compress = options.fetch(:compress, false)
 

data/test/reader_test.rb

@@ -69,13 +69,12 @@ class ReaderTest < Test::Unit::TestCase
 
     context "reading from file" do
       # With and without header
-      [false, true].each do |header|
-        context "with#{'out' unless header} header" do
+      [{:header => false}, {:header => true}, {:header => true, :compress => true}].each do |options|
+        context "with#{'out' unless options[:header]} header" do
           setup do
             @filename = '._test'
-            @options = { :header => header }
             # Create encrypted file
-            SymmetricEncryption::Writer.open(@filename, @options) do |file|
+            SymmetricEncryption::Writer.open(@filename, options) do |file|
               @data.inject(0) {|sum,str| sum + file.write(str)}
             end
           end

data/test/writer_test.rb

@@ -31,7 +31,7 @@ class EncryptionWriterTest < Test::Unit::TestCase
 
     should "encrypt to string stream" do
       stream = StringIO.new
-      file = SymmetricEncryption::Writer.new(stream)
+      file = SymmetricEncryption::Writer.new(stream, :header => false)
       written_len = @data.inject(0) {|sum,str| sum + file.write(str)}
       file.close
 
@@ -50,7 +50,7 @@ class EncryptionWriterTest < Test::Unit::TestCase
 
     should "encrypt to file using .open" do
       written_len = nil
-      SymmetricEncryption::Writer.open(@filename) do |file|
+      SymmetricEncryption::Writer.open(@filename, :header => false) do |file|
         written_len = @data.inject(0) {|sum,str| sum + file.write(str)}
       end
       assert_equal @data_len, written_len

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Reid Morrison
@@ -28,6 +28,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- csv.zip
+- csv_encrypted
+- csv_encrypted_zip
 - examples/symmetric-encryption.yml
 - lib/csv_encrypted
 - lib/symmetric-encryption.rb
@@ -50,8 +53,6 @@ files:
 - nbproject/project.xml
 - Rakefile
 - README.md
-- symmetric-encryption-0.6.0.gem
-- symmetric-encryption-0.6.1.gem
 - test/attr_encrypted_test.rb
 - test/cipher_test.rb
 - test/config/database.yml