symmetric-encryption 4.0.0 → 4.0.1

data/test/reader_test.rb

@@ -37,14 +37,14 @@ class ReaderTest < Minitest::Test
           @data_encrypted = header ? @data_encrypted_with_header : @data_encrypted_without_header
         end
 
-        it "#read()" do
+        it '#read()' do
           stream = StringIO.new(@data_encrypted)
           # Version 0 supplied if the file/stream does not have a header
-          decrypted = SymmetricEncryption::Reader.open(stream, version: 0) { |file| file.read }
+          decrypted = SymmetricEncryption::Reader.open(stream, version: 0, &:read)
           assert_equal @data_str, decrypted
         end
 
-        it "#read(size) followed by #read()" do
+        it '#read(size) followed by #read()' do
           stream = StringIO.new(@data_encrypted)
           # Version 0 supplied if the file/stream does not have a header
           decrypted = SymmetricEncryption::Reader.open(stream, version: 0) do |file|
@@ -54,7 +54,7 @@ class ReaderTest < Minitest::Test
           assert_equal @data_str[10..-1], decrypted
         end
 
-        it "#each_line" do
+        it '#each_line' do
           stream = StringIO.new(@data_encrypted)
           i      = 0
           # Version 0 supplied if the file/stream does not have a header
@@ -66,17 +66,17 @@ class ReaderTest < Minitest::Test
           end
         end
 
-        it "#read(size)" do
+        it '#read(size)' do
           stream = StringIO.new(@data_encrypted)
           # Version 0 supplied if the file/stream does not have a header
           SymmetricEncryption::Reader.open(stream, version: 0) do |file|
             index = 0
             [0, 10, 5, 5000].each do |size|
               buf = file.read(size)
-              if size == 0
+              if size.zero?
                 assert_equal '', buf
               else
-                assert_equal @data_str[index..index+size-1], buf
+                assert_equal @data_str[index..index + size - 1], buf
               end
               index += size
             end
@@ -99,11 +99,10 @@ class ReaderTest < Minitest::Test
       # Random iv only
       {random_key: false, random_iv: true},
       # Random iv only with compression
-      {random_iv: true, compress: true},
+      {random_iv: true, compress: true}
     ].each do |options|
 
-      [:data, :empty, :blank].each do |usecase|
-
+      %i[data empty blank].each do |usecase|
         describe "read from #{usecase} file with options: #{options.inspect}" do
           before do
             case usecase
@@ -140,7 +139,7 @@ class ReaderTest < Minitest::Test
           end
 
           it '.empty?' do
-            assert_equal (@data_size==0), SymmetricEncryption::Reader.empty?(@file_name)
+            assert_equal @data_size.zero?, SymmetricEncryption::Reader.empty?(@file_name)
             assert_raises Errno::ENOENT do
               SymmetricEncryption::Reader.empty?('missing_file')
             end
@@ -155,7 +154,7 @@ class ReaderTest < Minitest::Test
 
           it '.open return Zlib::GzipReader when compressed' do
             file = SymmetricEncryption::Reader.open(@file_name)
-            #assert_equal (@header && (options[:compress]||false)), file.is_a?(Zlib::GzipReader)
+            # assert_equal (@header && (options[:compress]||false)), file.is_a?(Zlib::GzipReader)
             file.close
           end
 
@@ -178,12 +177,11 @@ class ReaderTest < Minitest::Test
             file.close
 
             assert_equal @eof, eof
-            if @data_size > 0
+            if @data_size.positive?
               assert_equal @data_str, data
             else
               assert_nil data
             end
-
           end
 
           it '#each_line' do
@@ -212,40 +210,34 @@ class ReaderTest < Minitest::Test
             file.close
 
             assert_equal @eof, eof
-            if @data_size > 0
+            if @data_size.positive?
               assert_equal @data_str, data
+              # On JRuby Zlib::GzipReader.new(file) returns '' instead of nil on an empty file
+            elsif defined?(JRuby) && options[:compress] && (usecase == :empty)
+              assert_equal '', data
             else
-              # On JRuby Zlib::GzipReader.new(file) returns '' instead of nil
-              # on an empty file
-              if defined?(JRuby) && options[:compress] && (usecase == :empty)
-                assert_equal '', data
-              else
-                assert_nil data
-              end
+              assert_nil data
             end
           end
 
           it '#gets(delim)' do
             SymmetricEncryption::Reader.open(@file_name) do |file|
               i = 0
-              while line = file.gets("\n")
+              while (line = file.gets("\n"))
                 assert_equal @data[i], line
                 i += 1
               end
-              assert_equal (@data_size > 0 ? 3 : 0), i
+              assert_equal (@data_size.positive? ? 3 : 0), i
             end
           end
 
           it '#gets(delim,size)' do
             SymmetricEncryption::Reader.open(@file_name) do |file|
               i = 0
-              while file.gets("\n", 128)
-                i += 1
-              end
-              assert_equal (@data_size > 0 ? 3 : 0), i
+              i += 1 while file.gets("\n", 128)
+              assert_equal (@data_size.positive? ? 3 : 0), i
             end
           end
-
         end
       end
     end
@@ -264,7 +256,7 @@ class ReaderTest < Minitest::Test
       end
 
       it 'decrypt from file in a single read' do
-        decrypted = SymmetricEncryption::Reader.open(@file_name) { |file| file.read }
+        decrypted = SymmetricEncryption::Reader.open(@file_name, &:read)
         assert_equal @data_str, decrypted
       end
 
@@ -302,11 +294,12 @@ class ReaderTest < Minitest::Test
           File.delete(@file_name) if File.exist?(@file_name)
         rescue Errno::EACCES
           # Required for Windows
+          nil
         end
       end
 
       it 'decrypt from file in a single read' do
-        decrypted = SymmetricEncryption::Reader.open(@file_name, version: 0) { |file| file.read }
+        decrypted = SymmetricEncryption::Reader.open(@file_name, version: 0, &:read)
         assert_equal @data_str, decrypted
       end
 
@@ -317,6 +310,5 @@ class ReaderTest < Minitest::Test
         end
       end
     end
-
   end
 end

data/test/symmetric_encryption_test.rb

@@ -4,7 +4,6 @@ require_relative 'test_helper'
 #
 class SymmetricEncryptionTest < Minitest::Test
   describe 'SymmetricEncryption' do
-
     describe 'configuration' do
       before do
         config   = SymmetricEncryption::Config.new(
@@ -45,11 +44,11 @@ class SymmetricEncryptionTest < Minitest::Test
       end
     end
 
-    [:none, :base64, :base64strict, :base16].each do |encoding|
+    %i[none base64 base64strict base16].each do |encoding|
       describe "encoding: #{encoding}" do
         before do
-          @social_security_number                            = '987654321'
-          @social_security_number_encrypted                  =
+          @social_security_number             = '987654321'
+          @social_security_number_encrypted   =
             case encoding
             when :base64
               "QEVuQwIAS+8X1NRrqdfEIQyFHVPuVA==\n"
@@ -62,10 +61,9 @@ class SymmetricEncryptionTest < Minitest::Test
             else
               raise "Add test for encoding: #{encoding}"
             end
-          @social_security_number_encrypted_with_secondary_1 = "D1UCu38pqJ3jc0GvwJHiow==\n"
-          @non_utf8                                          = "\xc2".force_encoding('binary')
-          @encoding                                          = SymmetricEncryption.cipher.encoding
-          SymmetricEncryption.cipher.encoding                = encoding
+          @non_utf8                           = "\xc2".force_encoding('binary')
+          @encoding                           = SymmetricEncryption.cipher.encoding
+          SymmetricEncryption.cipher.encoding = encoding
         end
 
         after do
@@ -109,7 +107,7 @@ class SymmetricEncryptionTest < Minitest::Test
         end
 
         it 'determine if string is encrypted' do
-          if encoding == :base64strict || encoding == :base64
+          if %i[base64strict base64].include?(encoding)
             assert SymmetricEncryption.encrypted?(@social_security_number_encrypted)
             refute SymmetricEncryption.encrypted?(@social_security_number)
 
@@ -124,9 +122,10 @@ class SymmetricEncryptionTest < Minitest::Test
       before do
         @social_security_number = '987654321'
         # Encrypt data without a header and encode with base64 which has a trailing '\n'
-        @encrypted_0_ssn = SymmetricEncryption.cipher(0).encode(SymmetricEncryption.cipher(0).binary_encrypt(@social_security_number, header: false))
+        no_header        = SymmetricEncryption.cipher(0).binary_encrypt(@social_security_number, header: false)
+        @encrypted_0_ssn = SymmetricEncryption.cipher(0).encode(no_header)
 
-        SymmetricEncryption.select_cipher do |encoded_str, decoded_str|
+        SymmetricEncryption.select_cipher do |encoded_str, _decoded_str|
           # Use cipher version 0 if the encoded string ends with "\n" otherwise
           # use the current default cipher
           encoded_str.end_with?("\n") ? SymmetricEncryption.cipher(0) : SymmetricEncryption.cipher
@@ -147,7 +146,8 @@ class SymmetricEncryptionTest < Minitest::Test
       before do
         @social_security_number = '987654321'
         # Encrypt data without a header and encode with base64 which has a trailing '\n'
-        assert @encrypted_0_ssn = SymmetricEncryption.cipher(0).encode(SymmetricEncryption.cipher(0).binary_encrypt(@social_security_number, header: false))
+        no_header = SymmetricEncryption.cipher(0).binary_encrypt(@social_security_number, header: false)
+        assert @encrypted_0_ssn = SymmetricEncryption.cipher(0).encode(no_header)
       end
 
       it 'decrypt string without a header using an old cipher' do
@@ -207,12 +207,12 @@ class SymmetricEncryptionTest < Minitest::Test
       {
         integer:  21,
         float:    2.5,
-        decimal:  BigDecimal.new('12.58'),
-        datetime: DateTime.new(2001, 11, 26, 20, 55, 54, "-5"),
-        time:     Time.new(2013, 01, 01, 22, 30, 00, "-04:00"),
-        date:     Date.new(1927, 04, 01),
+        decimal:  BigDecimal('12.58'),
+        datetime: DateTime.new(2001, 11, 26, 20, 55, 54, '-5'),
+        time:     Time.new(2013, 1, 1, 22, 30, 0, '-04:00'),
+        date:     Date.new(1927, 4, 1),
         boolean:  true,
-        yaml:     {:a => :b},
+        yaml:     {a: :b},
         json:     {'a' => 'b'}
       }.each_pair do |type, value|
         describe type.to_s do
@@ -234,7 +234,6 @@ class SymmetricEncryptionTest < Minitest::Test
           assert_equal false, SymmetricEncryption.decrypt(encrypted, type: :boolean)
         end
       end
-
     end
   end
 end

data/test/writer_test.rb

@@ -73,6 +73,5 @@ class WriterTest < Minitest::Test
         assert_equal @data_str, SymmetricEncryption::Reader.read(@file_name)
       end
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symmetric-encryption
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coercible
@@ -24,8 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: Transparently encrypt ActiveRecord, Mongoid, and MongoMapper attributes.
-  Encrypt passwords in configuration files. Encrypt entire files at rest.
+description: 
 email:
 - reidmo@gmail.com
 executables:
@@ -98,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -106,31 +105,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Encryption for Ruby, and Ruby on Rails
+summary: Encrypt ActiveRecord and Mongoid attributes, files and passwords in configuration
+  files.
 test_files:
-- test/active_record_test.rb
-- test/cipher_test.rb
-- test/config/database.yml
-- test/config/empty.csv
-- test/config/mongo_mapper.yml
+- test/keystore/environment_test.rb
+- test/keystore/file_test.rb
+- test/symmetric_encryption_test.rb
+- test/config/test_secondary_1.key
 - test/config/mongoid.yml
-- test/config/symmetric-encryption.yml
 - test/config/test_new.iv
-- test/config/test_new.key
 - test/config/test_secondary_1.iv
-- test/config/test_secondary_1.key
-- test/encoder_test.rb
-- test/header_test.rb
-- test/key_test.rb
-- test/keystore/environment_test.rb
-- test/keystore/file_test.rb
-- test/keystore_test.rb
+- test/config/database.yml
+- test/config/test_new.key
+- test/config/symmetric-encryption.yml
+- test/config/empty.csv
+- test/config/mongo_mapper.yml
+- test/test_db.sqlite3
 - test/mongoid_test.rb
+- test/active_record_test.rb
+- test/keystore_test.rb
 - test/reader_test.rb
-- test/symmetric_encryption_test.rb
-- test/test_db.sqlite3
+- test/encoder_test.rb
+- test/key_test.rb
+- test/header_test.rb
 - test/test_helper.rb
 - test/writer_test.rb
+- test/cipher_test.rb