symmetric-encryption 3.8.2 → 3.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f99ee3679f67ccf977755f31245de76084376f2
-  data.tar.gz: 82e2ddb9b6e96b8674a306521111591233878b88
+  metadata.gz: 788a470ed0ed501adc827789838ad6460fa6070b
+  data.tar.gz: ba3c6a6865c5127fa409271e477ab2caee65c1a6
 SHA512:
-  metadata.gz: d4568a1b15d970a687aa1457367a0921a0a680a10976cf4e6b2e8540beb2c41bd76b92c3ccc0ae132b0bf000430522fc2a5b6e5a0ca84faf0ca6a69c7530412c
-  data.tar.gz: d9ccc83d7ac47c75ce04e743b6b42e9bd76e25ebdd5a05c2b89cda9f09da19be8d36a5e246db6bde21d730557e3cb100940e277b815c82b54054bc21928cf4d3
+  metadata.gz: 525c6df5648bbf5af0432eaab63a235e0ac0fbf3a9a503576e3cf89d11a8d074820aeea9017067afcce950d37f9902f3b39620e81c3239f615488316be57ff19
+  data.tar.gz: ac5ae0631681185ac0c2bbdfdb0fce0b61a803ddaa1410bc19cb77a98be7b1b37a9ef7417b047781c38c69ae6b75369085d654578767143e1d7b7143821ce251

data/README.md

@@ -1,4 +1,4 @@
-# symmetric-encryption
+# Symmetric Encryption
 ![](https://img.shields.io/gem/v/symmetric-encryption.svg) ![](https://img.shields.io/travis/rocketjob/symmetric-encryption.svg) ![](https://img.shields.io/gem/dt/symmetric-encryption.svg)  ![](https://img.shields.io/badge/status-production%20ready-blue.svg)
 
 * http://github.com/rocketjob/symmetric-encryption
@@ -19,21 +19,22 @@ expose all the encryption algorithms supported by OpenSSL.
 
 ## Documentation
 
-For complete documentation see: http://rocketjob.github.io/symmetric-encryption/
-
-## Documentation
-
 [Symmetric Encryption Guide](http://rocketjob.github.io/symmetric-encryption)
 
 [Reference Documentation](http://www.rubydoc.info/gems/symmetric-encryption/)
 
+## Rocket Job
+
+Checkout the sister project [Rocket Job](http://rocketjob.io): Ruby's missing batch system.
+
+Fully supports Symmetric Encryption to encrypt data in flight and at rest while running jobs in the background.
+
 ## Supports
 
-Symmetric Encryption works with the following Ruby interpreters:
+Symmetric Encryption works with the following Ruby VMs:
 
-* Ruby 1.9.3, 2.0, 2.1, 2.2, or greater
-* JRuby 1.7, 9.0, or greater
-* Rubinius 2.5, or greater
+- Ruby 2.1, 2.2, 2.3, and above
+- JRuby 1.7.23, 9.0.5 and above
 
 ## Upgrading to SymmetricEncryption V3
 

data/lib/symmetric_encryption/cipher.rb

@@ -383,7 +383,7 @@ module SymmetricEncryption
       end
       if include_key
         len = buffer.slice!(0..1).unpack('v').first
-        key = decryption_cipher.binary_decrypt(buffer.slice!(0..len-1), header=false)
+        key = decryption_cipher.binary_decrypt(buffer.slice!(0..len-1), false)
       end
       if include_cipher
         len         = buffer.slice!(0..1).unpack('v').first
@@ -476,7 +476,7 @@ module SymmetricEncryption
           self.class.build_header(version, compress, random_iv ? iv : nil, nil, nil) +
             openssl_cipher.update(compress ? Zlib::Deflate.deflate(string) : string)
         else
-          openssl_cipher.iv = @iv if @iv
+          openssl_cipher.iv = @iv if defined?(@iv) && @iv
           openssl_cipher.update(string)
         end
       result << openssl_cipher.final

data/lib/symmetric_encryption/coerce.rb

@@ -14,7 +14,7 @@ module SymmetricEncryption
     # Coerce given value into given type
     # Does not coerce json or yaml values
     def self.coerce(value, type, from_type=nil)
-      return if value.nil? || (value.is_a?(String) && (value !~ /[^[:space:]]/))
+      return if blank?(value)
 
       from_type ||= value.class
       case type
@@ -71,5 +71,22 @@ module SymmetricEncryption
         TYPE_MAP[symbol]
       end
     end
+
+    private
+
+    BLANK_RE = /\A[[:space:]]*\z/
+
+    # Returns [true|false] whether the supplied value is blank?
+    def self.blank?(value)
+      return true if value.nil?
+      if value.is_a?(String)
+        return true if value.empty?
+        # When Binary data is supplied that cannot convert to UTF-8 it is clearly not blank
+        return false unless value.dup.force_encoding(SymmetricEncryption::UTF8_ENCODING).valid_encoding?
+        (value =~ BLANK_RE) == 0
+      else
+        false
+      end
+    end
   end
 end

data/lib/symmetric_encryption/extensions/active_record/base.rb

@@ -106,7 +106,7 @@ module ActiveRecord #:nodoc:
         encrypted_columns.include?(attribute)
       end
 
-      protected
+      private
 
       # Allows you to use dynamic methods like <tt>find_by_email</tt> or <tt>scoped_by_email</tt> for
       # encrypted attributes

data/lib/symmetric_encryption/extensions/mongo_mapper/plugins/encrypted_key.rb

@@ -49,10 +49,10 @@ module MongoMapper
         #
         # The above document results in the following document in the Mongo collection 'persons':
         # {
-        #   "name" : "Joe",
-        #   "encrypted_social_security_number" : "...",
-        #   "age"  : 21
-        #   "encrypted_life_history" : "...",
+        #   'name' : 'Joe',
+        #   'encrypted_social_security_number' : '...',
+        #   'age'  : 21
+        #   'encrypted_life_history' : '...',
         # }
         #
         # Symmetric Encryption creates the getters and setters to be able to work with the field
@@ -67,12 +67,12 @@ module MongoMapper
         #   puts "Decrypted Social Security Number is: #{SymmetricEncryption.decrypt(person.encrypted_social_security_number)}"
         #
         #   # Sets the encrypted_social_security_number to encrypted version
-        #   person.social_security_number = "123456789"
+        #   person.social_security_number = '123456789'
         #
         #   # Or, is equivalent to:
-        #   person.encrypted_social_security_number = SymmetricEncryption.encrypt("123456789")
+        #   person.encrypted_social_security_number = SymmetricEncryption.encrypt('123456789')
         #
-        # Note: Only "String" types are currently supported for encryption
+        # Note: Only 'String' types are currently supported for encryption
         #
         # Note: Unlike attr_encrypted finders must use the encrypted field name
         #   Invalid Example, does not work:

data/lib/symmetric_encryption/extensions/mongoid/encrypted.rb

@@ -30,10 +30,10 @@
 #
 # The above document results in the following document in the Mongo collection 'persons':
 # {
-#   "name" : "Joe",
-#   "encrypted_social_security_number" : "...",
-#   "age"  : 21
-#   "encrypted_life_history" : "...",
+#   'name' : 'Joe',
+#   'encrypted_social_security_number' : '...',
+#   'age'  : 21
+#   'encrypted_life_history' : '...',
 # }
 #
 # Symmetric Encryption creates the getters and setters to be able to work with the field
@@ -48,12 +48,12 @@
 #   puts "Decrypted Social Security Number is: #{SymmetricEncryption.decrypt(person.encrypted_social_security_number)}"
 #
 #   # Sets the encrypted_social_security_number to encrypted version
-#   person.social_security_number = "123456789"
+#   person.social_security_number = '123456789'
 #
 #   # Or, is equivalent to:
-#   person.encrypted_social_security_number = SymmetricEncryption.encrypt("123456789")
+#   person.encrypted_social_security_number = SymmetricEncryption.encrypt('123456789')
 #
-# Note: Only "String" types are currently supported for encryption
+# Note: Only 'String' types are currently supported for encryption
 #
 # Note: Unlike attr_encrypted finders must use the encrypted field name
 #   Invalid Example, does not work:

data/lib/symmetric_encryption/generator.rb

@@ -25,7 +25,7 @@ module SymmetricEncryption
         # Freeze the decrypted field value so that it is not modified directly
         def #{decrypted_name}=(value)
           v = SymmetricEncryption::Coerce.coerce(value, :#{type})
-          self.#{encrypted_name} = @stored_#{encrypted_name} = ::SymmetricEncryption.encrypt(v,#{random_iv},#{compress},:#{type})
+          self.#{encrypted_name} = @stored_#{encrypted_name} = ::SymmetricEncryption.encrypt(v, #{random_iv}, #{compress}, :#{type})
           @#{decrypted_name} = v.freeze
         end
 
@@ -33,8 +33,8 @@ module SymmetricEncryption
         # The decrypted value is cached and is only decrypted if the encrypted value has changed
         # If this method is not called, then the encrypted value is never decrypted
         def #{decrypted_name}
-          if @stored_#{encrypted_name} != self.#{encrypted_name}
-            @#{decrypted_name} = ::SymmetricEncryption.decrypt(self.#{encrypted_name},version=nil,:#{type}).freeze
+          if !defined?(@stored_#{encrypted_name}) || (@stored_#{encrypted_name} != self.#{encrypted_name})
+            @#{decrypted_name} = ::SymmetricEncryption.decrypt(self.#{encrypted_name}, nil, :#{type}).freeze
             @stored_#{encrypted_name} = self.#{encrypted_name}
           end
           @#{decrypted_name}

data/lib/symmetric_encryption/version.rb

@@ -1,3 +1,3 @@
 module SymmetricEncryption #:nodoc
-  VERSION = '3.8.2'
+  VERSION = '3.8.3'
 end

data/lib/symmetric_encryption/writer.rb

@@ -79,7 +79,7 @@ module SymmetricEncryption
     # # Example: Encrypt and write data to a file
     # SymmetricEncryption::Writer.open('test_file') do |file|
     #   file.write "Hello World\n"
-    #   file.write "Keep this secret"
+    #   file.write 'Keep this secret'
     # end
     #
     # # Example: Compress, Encrypt and write data to a file
@@ -193,7 +193,7 @@ module SymmetricEncryption
     # Returns self
     #
     # Example:
-    #   file << "Hello.\n" << "This is Jack"
+    #   file << "Hello.\n" << 'This is Jack'
     def <<(data)
       write(data)
       self

data/test/active_record_test.rb

@@ -9,8 +9,9 @@ ActiveRecord::Schema.define version: 0 do
   create_table :users, force: true do |t|
     t.string :encrypted_bank_account_number
     t.string :encrypted_social_security_number
-    t.string :encrypted_string
-    t.text   :encrypted_long_string
+    t.string :encrypted_string_value
+    t.text   :encrypted_long_string_value
+    t.text   :encrypted_binary_string_value
     t.text   :encrypted_data_yaml
     t.text   :encrypted_data_json
     t.string :name
@@ -38,10 +39,11 @@ end
 class User < ActiveRecord::Base
   attr_encrypted :bank_account_number
   attr_encrypted :social_security_number
-  attr_encrypted :string,         random_iv: true
-  attr_encrypted :long_string,    random_iv: true, compress: true
-  attr_encrypted :data_yaml,      random_iv: true, compress: true, type: :yaml
-  attr_encrypted :data_json,      random_iv: true, compress: true, type: :json
+  attr_encrypted :string_value,        random_iv: true
+  attr_encrypted :long_string_value,   random_iv: true, compress: true
+  attr_encrypted :binary_string_value, random_iv: true, compress: true
+  attr_encrypted :data_yaml,           random_iv: true, compress: true, type: :yaml
+  attr_encrypted :data_json,           random_iv: true, compress: true, type: :json
 
   attr_encrypted :integer_value,  type: :integer
   attr_encrypted :float_value,    type: :float
@@ -71,14 +73,14 @@ class UniqueUser < ActiveRecord::Base
 
   validates :username,
     length:      {in: 3..20},
-    format:      {with: /\A[\w\d\-[[:alnum:]]]+\z/},
+    format:      {with: /\A[\w\-]+\z/},
     allow_blank: true
 end
 #@formatter:on
 
 # Initialize the database connection
 config_file = File.join(File.dirname(__FILE__), 'config', 'database.yml')
-raise 'database config not found. Create a config file at: test/config/database.yml' unless File.exists? config_file
+raise 'database config not found. Create a config file at: test/config/database.yml' unless File.exist? config_file
 
 cfg = YAML.load(ERB.new(File.new(config_file).read).result)['test']
 raise("Environment 'test' not defined in test/config/database.yml") unless cfg
@@ -90,12 +92,15 @@ User.establish_connection(cfg)
 #
 class ActiveRecordTest < Minitest::Test
   describe 'ActiveRecord' do
-    INTEGER_VALUE  = 12
-    FLOAT_VALUE    = 88.12345
-    DECIMAL_VALUE  = BigDecimal.new("22.51")
-    DATETIME_VALUE = DateTime.new(2001, 11, 26, 20, 55, 54, "-5")
-    TIME_VALUE     = Time.new(2013, 01, 01, 22, 30, 00, "-04:00")
-    DATE_VALUE     = Date.new(1927, 04, 02)
+    INTEGER_VALUE       = 12
+    FLOAT_VALUE         = 88.12345
+    DECIMAL_VALUE       = BigDecimal.new('22.51')
+    DATETIME_VALUE      = DateTime.new(2001, 11, 26, 20, 55, 54, "-5")
+    TIME_VALUE          = Time.new(2013, 01, 01, 22, 30, 00, "-04:00")
+    DATE_VALUE          = Date.new(1927, 04, 02)
+    STRING_VALUE        = 'A string containing some data to be encrypted with a random initialization vector'
+    LONG_STRING_VALUE   = 'A string containing some data to be encrypted with a random initialization vector and compressed since it takes up so much space in plain text form'
+    BINARY_STRING_VALUE = "Non-UTF8 Binary \x92 string".force_encoding('BINARY')
 
     before do
       @bank_account_number           = '1234567890'
@@ -104,9 +109,6 @@ class ActiveRecordTest < Minitest::Test
       @social_security_number           = '987654321'
       @social_security_number_encrypted = 'QEVuQwIAS+8X1NRrqdfEIQyFHVPuVA=='
 
-      @string      = 'A string containing some data to be encrypted with a random initialization vector'
-      @long_string = 'A string containing some data to be encrypted with a random initialization vector and compressed since it takes up so much space in plain text form'
-
       @name = 'Joe Bloggs'
 
       @h = {a: 'A', b: 'B'}
@@ -118,6 +120,9 @@ class ActiveRecordTest < Minitest::Test
         social_security_number: @social_security_number,
         name:                   @name,
         # data type specific fields
+        string_value:           STRING_VALUE,
+        long_string_value:      LONG_STRING_VALUE,
+        binary_string_value:    BINARY_STRING_VALUE,
         integer_value:          INTEGER_VALUE,
         float_value:            FLOAT_VALUE,
         decimal_value:          DECIMAL_VALUE,
@@ -164,18 +169,18 @@ class ActiveRecordTest < Minitest::Test
     end
 
     it 'support a random iv' do
-      @user.string = @string
-      assert first_value = @user.encrypted_string
+      @user.string_value = STRING_VALUE
+      assert first_value = @user.encrypted_string_value
       # Assign the same value
-      @user.string = @string.dup
-      assert_equal true, first_value != @user.encrypted_string
+      @user.string_value = STRING_VALUE.dup
+      assert first_value != @user.encrypted_string_value
     end
 
     it 'support a random iv and compress' do
-      @user.string      = @long_string
-      @user.long_string = @long_string
+      @user.string_value      = STRING_VALUE
+      @user.long_string_value = STRING_VALUE
 
-      assert_equal true, (@user.encrypted_long_string.length.to_f / @user.encrypted_string.length) < 0.8
+      refute_equal @user.encrypted_long_string_value, @user.encrypted_string_value
     end
 
     it 'encrypt' do
@@ -238,51 +243,51 @@ class ActiveRecordTest < Minitest::Test
     it 'return encrypted keys for the class' do
       expect = [:social_security_number, :bank_account_number]
       result = User.encrypted_keys
-      expect.each { |val| assert_equal true, result.include?(val) }
+      expect.each { |val| assert result.include?(val) }
 
       # Also check encrypted_attribute?
-      expect.each { |val| assert_equal true, User.encrypted_attribute?(val) }
+      expect.each { |val| assert User.encrypted_attribute?(val) }
     end
 
     it 'return encrypted columns for the class' do
       expect = [:encrypted_social_security_number, :encrypted_bank_account_number]
       result = User.encrypted_columns
-      expect.each { |val| assert_equal true, result.include?(val) }
+      expect.each { |val| assert result.include?(val) }
 
       # Also check encrypted_column?
-      expect.each { |val| assert_equal true, User.encrypted_column?(val) }
+      expect.each { |val| assert User.encrypted_column?(val) }
     end
 
     it 'validate encrypted data' do
-      assert_equal true, @user.valid?
+      assert @user.valid?
       @user.encrypted_bank_account_number = '123'
       assert_equal false, @user.valid?
-      assert_equal ["must be a value encrypted using SymmetricEncryption.encrypt"], @user.errors[:encrypted_bank_account_number]
+      assert_equal ['must be a value encrypted using SymmetricEncryption.encrypt'], @user.errors[:encrypted_bank_account_number]
       @user.encrypted_bank_account_number = SymmetricEncryption.encrypt('123')
-      assert_equal true, @user.valid?
+      assert @user.valid?
       @user.bank_account_number = '123'
-      assert_equal true, @user.valid?
+      assert @user.valid?
     end
 
     it 'validate un-encrypted string data' do
-      assert_equal true, @user.valid?
+      assert @user.valid?
       @user.text = '123'
       assert_equal false, @user.valid?
-      assert_equal ["only allows letters"], @user.errors[:text]
+      assert_equal ['only allows letters'], @user.errors[:text]
       @user.text = nil
       assert_equal false, @user.valid?
-      assert_equal ["only allows letters", "can't be blank"], @user.errors[:text]
+      assert_equal ['only allows letters', "can't be blank"], @user.errors[:text]
       @user.text = ''
       assert_equal false, @user.valid?
-      assert_equal ["only allows letters", "can't be blank"], @user.errors[:text]
+      assert_equal ['only allows letters', "can't be blank"], @user.errors[:text]
     end
 
     it 'validate un-encrypted integer data with coercion' do
-      assert_equal true, @user.valid?
+      assert @user.valid?
       @user.number = '123'
-      assert_equal true, @user.valid?
+      assert @user.valid?
       assert_equal 123, @user.number
-      assert_equal true, @user.valid?
+      assert @user.valid?
       @user.number = ''
       assert_equal false, @user.valid?
       assert_equal nil, @user.number
@@ -294,22 +299,22 @@ class ActiveRecordTest < Minitest::Test
       assert_equal ["can't be blank"], @user.errors[:number]
     end
 
-    describe "with saved user" do
+    describe 'with saved user' do
       before do
         @user.save!
       end
 
       after do
-        @user.destroy
+        @user.destroy if @user
       end
 
-      it "return correct data type before save" do
-        u = User.new(integer_value: "5")
+      it 'return correct data type before save' do
+        u = User.new(integer_value: '5')
         assert_equal 5, u.integer_value
         assert u.integer_value.kind_of?(Integer)
       end
 
-      it "handle gsub! for non-encrypted_field" do
+      it 'handle gsub! for non-encrypted_field' do
         @user.name.gsub!('a', 'v')
         new_name = @name.gsub('a', 'v')
         assert_equal new_name, @user.name
@@ -324,7 +329,7 @@ class ActiveRecordTest < Minitest::Test
         end
       end
 
-      it "revert changes on reload" do
+      it 'revert changes on reload' do
         new_bank_account_number   = '444444444'
         @user.bank_account_number = new_bank_account_number
         assert_equal new_bank_account_number, @user.bank_account_number
@@ -335,7 +340,7 @@ class ActiveRecordTest < Minitest::Test
         assert_equal @bank_account_number, @user.bank_account_number
       end
 
-      it "revert changes to encrypted field on reload" do
+      it 'revert changes to encrypted field on reload' do
         new_bank_account_number             = '111111111'
         new_encrypted_bank_account_number   = SymmetricEncryption.encrypt(new_bank_account_number)
         @user.encrypted_bank_account_number = new_encrypted_bank_account_number
@@ -348,21 +353,24 @@ class ActiveRecordTest < Minitest::Test
         assert_equal @bank_account_number, @user.bank_account_number
       end
 
-      describe "data types" do
+      describe 'data types' do
         before do
           @user_clone = User.find(@user.id)
         end
 
         [
           #@formatter:off
-          { attribute: :integer_value,  klass: Integer,    value: INTEGER_VALUE,  new_value: 98 },
-          { attribute: :float_value,    klass: Float,      value: FLOAT_VALUE,    new_value: 45.4321 },
-          { attribute: :decimal_value,  klass: BigDecimal, value: DECIMAL_VALUE,  new_value: BigDecimal.new("99.95"), coercible: "22.51"},
-          { attribute: :datetime_value, klass: DateTime,   value: DATETIME_VALUE, new_value: DateTime.new(1998, 10, 21, 8, 33, 28, "+5"), coercible: DATETIME_VALUE.to_time},
-          { attribute: :time_value,     klass: Time,       value: TIME_VALUE,     new_value: Time.new(2000, 01, 01, 22, 30, 00, "-04:00") },
-          { attribute: :date_value,     klass: Date,       value: DATE_VALUE,     new_value: Date.new(2027, 04, 02), coercible: DATE_VALUE.to_time },
-          { attribute: :true_value,     klass: TrueClass,  value: true,           new_value: false },
-          { attribute: :false_value,    klass: FalseClass, value: false,          new_value: true },
+          {attribute: :integer_value,       klass: Integer,    value: INTEGER_VALUE,       new_value: 98},
+          {attribute: :float_value,         klass: Float,      value: FLOAT_VALUE,         new_value: 45.4321},
+          {attribute: :decimal_value,       klass: BigDecimal, value: DECIMAL_VALUE,       new_value: BigDecimal.new('99.95'), coercible: '22.51'},
+          {attribute: :datetime_value,      klass: DateTime,   value: DATETIME_VALUE,      new_value: DateTime.new(1998, 10, 21, 8, 33, 28, '+5'), coercible: DATETIME_VALUE.to_time},
+          {attribute: :time_value,          klass: Time,       value: TIME_VALUE,          new_value: Time.new(2000, 01, 01, 22, 30, 00, "-04:00")},
+          {attribute: :date_value,          klass: Date,       value: DATE_VALUE,          new_value: Date.new(2027, 04, 02), coercible: DATE_VALUE.to_time},
+          {attribute: :true_value,          klass: TrueClass,  value: true,                new_value: false},
+          {attribute: :false_value,         klass: FalseClass, value: false,               new_value: true},
+          {attribute: :string_value,        klass: String,     value: STRING_VALUE,        new_value: 'Hello World'},
+          {attribute: :long_string_value,   klass: String,     value: LONG_STRING_VALUE,   new_value: 'A Really long Hello World'},
+          {attribute: :binary_string_value, klass: String,     value: BINARY_STRING_VALUE, new_value: "A new Non-UTF8 Binary \x92 string".force_encoding('BINARY')},
           #@formatter:on
         ].each do |value_test|
           describe "#{value_test[:klass]} values" do
@@ -374,18 +382,18 @@ class ActiveRecordTest < Minitest::Test
               @new_value = value_test[:new_value]
             end
 
-            it "return correct data type" do
-              assert_equal @value, @user_clone.send(@attribute)
+            it 'return correct data type' do
+              assert_equal @value, @user_clone.send(@attribute), @user_clone.attributes.ai
               assert @user.clone.send(@attribute).kind_of?(@klass)
             end
 
-            it "coerce data type before save" do
+            it 'coerce data type before save' do
               u = User.new(@attribute => @value)
               assert_equal @value, u.send(@attribute)
               assert u.send(@attribute).kind_of?(@klass), "Value supposed to be coerced into #{@klass}, but is #{u.send(@attribute).class.name}"
             end
 
-            it "permit replacing value with nil" do
+            it 'permit replacing value with nil' do
               @user_clone.send("#{@attribute}=".to_sym, nil)
               @user_clone.save!
 
@@ -394,7 +402,7 @@ class ActiveRecordTest < Minitest::Test
               assert_nil @user.send("encrypted_#{@attribute}".to_sym)
             end
 
-            it "permit replacing value with an empty string" do
+            it 'permit replacing value with an empty string' do
               @user_clone.send("#{@attribute}=".to_sym, '')
               @user_clone.save!
 
@@ -403,7 +411,7 @@ class ActiveRecordTest < Minitest::Test
               assert_nil @user.send("encrypted_#{@attribute}".to_sym)
             end
 
-            it "permit replacing value with a blank string" do
+            it 'permit replacing value with a blank string' do
               @user_clone.send("#{@attribute}=".to_sym, '    ')
               @user_clone.save!
 
@@ -412,7 +420,7 @@ class ActiveRecordTest < Minitest::Test
               assert_nil @user.send("encrypted_#{@attribute}".to_sym)
             end
 
-            it "permit replacing value" do
+            it 'permit replacing value' do
               @user_clone.send("#{@attribute}=".to_sym, @new_value)
               @user_clone.save!
 
@@ -422,7 +430,7 @@ class ActiveRecordTest < Minitest::Test
           end
         end
 
-        describe "JSON Serialization" do
+        describe 'JSON Serialization' do
           before do
             # JSON Does not support symbols, so they will come back as strings
             # Convert symbols to string in the test
@@ -432,18 +440,18 @@ class ActiveRecordTest < Minitest::Test
             end
           end
 
-          it "return correct data type" do
+          it 'return correct data type' do
             assert_equal @h, @user_clone.data_json
             assert @user.clone.data_json.kind_of?(Hash)
           end
 
-          it "not coerce data type (leaves as hash) before save" do
+          it 'not coerce data type (leaves as hash) before save' do
             u = User.new(data_json: @h)
             assert_equal @h, u.data_json
             assert u.data_json.kind_of?(Hash)
           end
 
-          it "permit replacing value with nil" do
+          it 'permit replacing value with nil' do
             @user_clone.data_json = nil
             @user_clone.save!
 
@@ -452,7 +460,7 @@ class ActiveRecordTest < Minitest::Test
             assert_nil @user.encrypted_data_json
           end
 
-          it "permit replacing value" do
+          it 'permit replacing value' do
             new_value             = @h.clone
             new_value['c']        = 'C'
             @user_clone.data_json = new_value
@@ -463,19 +471,19 @@ class ActiveRecordTest < Minitest::Test
           end
         end
 
-        describe "YAML Serialization" do
-          it "return correct data type" do
+        describe 'YAML Serialization' do
+          it 'return correct data type' do
             assert_equal @h, @user_clone.data_yaml
             assert @user.clone.data_yaml.kind_of?(Hash)
           end
 
-          it "not coerce data type (leaves as hash) before save" do
+          it 'not coerce data type (leaves as hash) before save' do
             u = User.new(data_yaml: @h)
             assert_equal @h, u.data_yaml
             assert u.data_yaml.kind_of?(Hash)
           end
 
-          it "permit replacing value with nil" do
+          it 'permit replacing value with nil' do
             @user_clone.data_yaml = nil
             @user_clone.save!
 
@@ -484,7 +492,7 @@ class ActiveRecordTest < Minitest::Test
             assert_nil @user.encrypted_data_yaml
           end
 
-          it "permit replacing value" do
+          it 'permit replacing value' do
             new_value             = @h.clone
             new_value[:c]         = 'C'
             @user_clone.data_yaml = new_value
@@ -504,8 +512,8 @@ class ActiveRecordTest < Minitest::Test
 
         it 'return true if it was changed' do
           @user.bank_account_number = '15424623'
-          assert_equal true, @user.encrypted_bank_account_number_changed?
-          assert_equal true, @user.bank_account_number_changed?
+          assert @user.encrypted_bank_account_number_changed?
+          assert @user.bank_account_number_changed?
         end
       end
     end