symmetric-encryption 3.6.0 → 3.7.0

data/test/mongoid_test.rb

@@ -1,5 +1,9 @@
-require File.dirname(__FILE__) + '/test_helper'
-if defined?(Mongoid)
+begin
+  require 'mongoid'
+  require_relative 'test_helper'
+  require_relative '../lib/symmetric_encryption/extensions/mongoid/encrypted'
+  ENV['RACK_ENV'] = 'test'
+
   Mongoid.logger = SemanticLogger[Mongoid]
   filename = defined?(Mongoid::VERSION) ? "test/config/mongoid_v3.yml" : "test/config/mongoid_v2.yml"
   Mongoid.load!(filename)
@@ -14,7 +18,7 @@ if defined?(Mongoid)
     field :encrypted_long_string,            type: String,  encrypted: {random_iv: true, compress: true}
 
     field :encrypted_integer_value,          type: String, encrypted: {type: :integer}
-    field :aiv,                              type: String, encrypted: {type: :integer, encrypt_as: :aliased_integer_value}
+    field :aiv,                              type: String, encrypted: {type: :integer, decrypt_as: :aliased_integer_value}
     field :encrypted_float_value,            type: String, encrypted: {type: :float}
     field :encrypted_decimal_value,          type: String, encrypted: {type: :decimal}
     field :encrypted_datetime_value,         type: String, encrypted: {type: :datetime}
@@ -32,7 +36,7 @@ if defined?(Mongoid)
   #
   # Unit Tests for field encrypted and validation aspects of SymmetricEncryption
   #
-  class MongoidTest < Test::Unit::TestCase
+  class MongoidTest < Minitest::Test
     context 'Mongoid' do
       setup do
         @bank_account_number = "1234567890"
@@ -532,4 +536,7 @@ if defined?(Mongoid)
 
     end
   end
+
+rescue LoadError
+  puts "Not running Mongoid tests because mongoid gem is not installed!!!"
 end

data/test/reader_test.rb

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/test_helper'
+require_relative 'test_helper'
 require 'stringio'
 
 # Unit Test for SymmetricEncrypted::ReaderStream
 #
-class ReaderTest < Test::Unit::TestCase
+class ReaderTest < Minitest::Test
   context SymmetricEncryption::Reader do
     setup do
       @data = [
@@ -143,14 +143,14 @@ class ReaderTest < Test::Unit::TestCase
 
           should ".empty?" do
             assert_equal (@data_size==0), SymmetricEncryption::Reader.empty?(@filename)
-            assert_raise Errno::ENOENT do
+            assert_raises Errno::ENOENT do
               SymmetricEncryption::Reader.empty?('missing_file')
             end
           end
 
           should ".header_present?" do
             assert_equal @header, SymmetricEncryption::Reader.header_present?(@filename)
-            assert_raise Errno::ENOENT do
+            assert_raises Errno::ENOENT do
               SymmetricEncryption::Reader.header_present?('missing_file')
             end
           end
@@ -174,8 +174,6 @@ class ReaderTest < Test::Unit::TestCase
           end
 
           should "#read(size)" do
-            data = nil
-            eof = nil
             file = SymmetricEncryption::Reader.open(@filename)
             eof = file.eof?
             data = file.read(4096)
@@ -205,15 +203,23 @@ class ReaderTest < Test::Unit::TestCase
           end
 
           should "#gets(nil,size)" do
-            data = nil
-            eof = nil
             file = SymmetricEncryption::Reader.open(@filename)
             eof = file.eof?
             data = file.gets(nil,4096)
             file.close
 
             assert_equal @eof, eof
-            assert_equal (@data_size > 0 ? @data_str : nil), data
+            if @data_size > 0
+              assert_equal @data_str, 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_equal nil, data
+              end
+            end
           end
 
           should "#gets(delim)" do
@@ -303,7 +309,7 @@ class ReaderTest < Test::Unit::TestCase
 
       should "decrypt from file in a single read with different version" do
         # Should fail since file was encrypted using version 0 key
-        assert_raise OpenSSL::Cipher::CipherError do
+        assert_raises OpenSSL::Cipher::CipherError do
           SymmetricEncryption::Reader.open(@filename, version: 2) {|file| file.read}
         end
       end

data/test/symmetric_encryption_test.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/test_helper'
+require_relative 'test_helper'
 
 # Unit Test for SymmetricEncryption
 #
-class SymmetricEncryptionTest < Test::Unit::TestCase
+class SymmetricEncryptionTest < Minitest::Test
   context 'SymmetricEncryption' do
 
     context 'configuration' do
@@ -276,6 +276,19 @@ class SymmetricEncryptionTest < Test::Unit::TestCase
             assert_equal @is_broken, SymmetricEncryption.decrypt(encrypted, version=nil, type=:boolean)
           end
         end
+
+        context "when yaml" do
+          setup do
+            @test = { :a => :b }
+          end
+
+          should "encrypt and decrypt a false value to and from a boolean" do
+            assert encrypted = SymmetricEncryption.encrypt(@test, random_iv=false, compress=false, type=:yaml)
+            assert_equal true, SymmetricEncryption.encrypted?(encrypted)
+            assert_equal @test, SymmetricEncryption.decrypt(encrypted, version=nil, type=:yaml)
+          end
+        end
+
       end
     end
 

data/test/test_helper.rb

@@ -1,17 +1,19 @@
 # Allow examples to be run in-place without requiring a gem install
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
-require 'rubygems'
+require 'yaml'
+require 'minitest/autorun'
+require 'minitest/reporters'
+require 'minitest/stub_any_instance'
+require 'shoulda/context'
 require 'semantic_logger'
-require 'erb'
-require 'test/unit'
 # Since we want both the AR and Mongoid extensions loaded we need to require them first
 require 'active_record'
 require 'symmetric-encryption'
-# Should redefines Proc#bind so must include after Rails
-require 'shoulda'
 
-SemanticLogger.add_appender('test.log') if SemanticLogger.appenders.size == 0
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+
+SemanticLogger.add_appender('test.log', &SemanticLogger::Appender::Base.colorized_formatter)
 SemanticLogger.default_level = :trace
 
 # Load Symmetric Encryption keys

data/test/writer_test.rb

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/test_helper'
+require_relative 'test_helper'
 require 'stringio'
 
 # Unit Test for Symmetric::EncryptedStream
 #
-class WriterTest < Test::Unit::TestCase
+class WriterTest < Minitest::Test
   context SymmetricEncryption::Writer do
     setup do
       @data = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symmetric-encryption
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coercible
@@ -37,6 +37,7 @@ files:
 - README.md
 - Rakefile
 - examples/symmetric-encryption.yml
+- lib/_test_empty
 - lib/rails/generators/symmetric_encryption/config/config_generator.rb
 - lib/rails/generators/symmetric_encryption/config/templates/symmetric-encryption.yml
 - lib/rails/generators/symmetric_encryption/heroku_config/heroku_config_generator.rb
@@ -45,6 +46,7 @@ files:
 - lib/symmetric-encryption.rb
 - lib/symmetric_encryption.rb
 - lib/symmetric_encryption/cipher.rb
+- lib/symmetric_encryption/exception.rb
 - lib/symmetric_encryption/extensions/active_record/base.rb
 - lib/symmetric_encryption/extensions/mongo_mapper/plugins/encrypted_key.rb
 - lib/symmetric_encryption/extensions/mongoid/encrypted.rb
@@ -87,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -95,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Symmetric Encryption for Ruby, and Ruby on Rails