lockbox 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c64ea693f929a79e495419fe5203760f73a2e1047602031eb90dcfd6542448d7
-  data.tar.gz: d5c43889eb01598b80ed47bb2d521fbd4970a94bf0e0880770f66f54d0ccfca9
+  metadata.gz: 05cf227cc78a31ce5ad67f4352196ee720d31e0f614db26089d1c5b0a17ae823
+  data.tar.gz: c47effd7829d2e7ffc7143d51fa6adb03ae6e11bd24f8b7048d39c2e559d5389
 SHA512:
-  metadata.gz: 760e4d28aaa0e3c059541ee91367112036e34bb87b64232d6de3a5e0c016ed59d47c79ea8549d67bb30922277869eed1187d2c5d77349430b7de81d50f2bc7d3
-  data.tar.gz: cee190766d994e26e05fce781c17404fd99fa74d1606c57f1103ed4e428abb0f2256779f005ace00123e07901fd3c4435083e6e950d8d01e92609625dfeca2da
+  metadata.gz: 79b18945ec5c492feedc8913669dde990b7849264b0ca3bc9e5a3be991656a59e5f953e414cf51108b747aa1d98687838715452824f0e38697cbe55fe0cae023
+  data.tar.gz: a747b3d2ebe4dd12cfafd91fb4970bd020515a8585a05d0bdd222ddbe30e6f402e596b4188c1d945bfaf6d2cb21914fddfd1199030f9ca73c61a5a02acf24b0f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.5 (2020-04-13)
+
+- Added `array` type
+- Fixed serialize error with `json` type
+- Fixed empty hash with `hash` type
+
 ## 0.3.4 (2020-04-05)
 
 - Fixed `migrating: true` with `validate: false`

data/README.md

@@ -103,6 +103,7 @@ class User < ApplicationRecord
   encrypts :video, type: :binary
   encrypts :properties, type: :json
   encrypts :settings, type: :hash
+  encrypts :messages, type: :array
 end
 ```
 

data/lib/lockbox/model.rb

@@ -11,6 +11,8 @@ module Lockbox
       #   options[:type] = :json
       # when Hash
       #   options[:type] = :hash
+      # when Array
+      #   options[:type] = :array
       # when String
       #   options[:type] = :string
       # when Integer
@@ -20,7 +22,7 @@ module Lockbox
       # end
 
       custom_type = options[:type].respond_to?(:serialize) && options[:type].respond_to?(:deserialize)
-      raise ArgumentError, "Unknown type: #{options[:type]}" unless custom_type || [nil, :string, :boolean, :date, :datetime, :time, :integer, :float, :binary, :json, :hash].include?(options[:type])
+      raise ArgumentError, "Unknown type: #{options[:type]}" unless custom_type || [nil, :string, :boolean, :date, :datetime, :time, :integer, :float, :binary, :json, :hash, :array].include?(options[:type])
 
       activerecord = defined?(ActiveRecord::Base) && self < ActiveRecord::Base
       raise ArgumentError, "Type not supported yet with Mongoid" if options[:type] && !activerecord
@@ -112,7 +114,7 @@ module Lockbox
             if options[:type]
               attribute_type =
                 case options[:type]
-                when :json, :hash
+                when :json, :hash, :array
                   :string
                 when :integer
                   ActiveModel::Type::Integer.new(limit: 8)
@@ -124,6 +126,7 @@ module Lockbox
 
               serialize name, JSON if options[:type] == :json
               serialize name, Hash if options[:type] == :hash
+              serialize name, Array if options[:type] == :array
             elsif !attributes_to_define_after_schema_loads.key?(name.to_s)
               # when migrating it's best to specify the type directly
               # however, we can try to use the original type if its already defined
@@ -223,19 +226,23 @@ module Lockbox
           define_method(name) do
             message = super()
 
-            unless message
+            # possibly keep track of decrypted attributes directly in the future
+            # Hash serializer returns {} when nil, Array serializer returns [] when nil
+            # check for this explicitly as a layer of safety
+            if message.nil? || ((message == {} || message == []) && activerecord && @attributes[name.to_s].value_before_type_cast.nil?)
               ciphertext = send(encrypted_attribute)
               message = self.class.send(decrypt_method_name, ciphertext, context: self)
 
               if activerecord
-                # set previous attribute on first decrypt
-                if @attributes[name.to_s]
-                  @attributes[name.to_s].instance_variable_set("@value_before_type_cast", message)
-                end
+                # set previous attribute so changes populate correctly
+                # it's fine if this is set on future decryptions (as is the case when message is nil)
+                # as only the first value is loaded into changes
+                @attributes[name.to_s].instance_variable_set("@value_before_type_cast", message)
 
                 # cache
-                if respond_to?(:_write_attribute, true)
-                  _write_attribute(name, message) if !@attributes.frozen?
+                # decrypt method does type casting
+                if respond_to?(:write_attribute_without_type_cast, true)
+                  write_attribute_without_type_cast(name, message) if !@attributes.frozen?
                 else
                   raw_write_attribute(name, message) if !@attributes.frozen?
                 end

data/lib/lockbox/version.rb

@@ -1,3 +1,3 @@
 module Lockbox
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockbox
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler