mongoid-kms 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8740fb7087ff5321a6b9384407c4904db55aa66c
-  data.tar.gz: 69935f5dfcfa7bb76f2e8a02e0e4db34757ecb5b
+  metadata.gz: 223bbdfbc44f7c82f1dddc67f033201abbc6f760
+  data.tar.gz: 9213598783f90c60f3dc71fdbf95b530a18f958e
 SHA512:
-  metadata.gz: 8c7e9b9284539a70e9d96be0036a3dfad343c4711e8777ea8b2322afa558a65e227f17826c07757a743c6f0a80950a434469619b7b126fab7ae2835150c350c1
-  data.tar.gz: 8a0726d5ddb9c3c275d1a1af4ffc741d9a91e69a96252143e40c3c98e5dfbfc063639c2ca480fb68b92a129cfed63b69ee01a5a4344a182841cd9dd1bcb07320
+  metadata.gz: def657da1f529c0b15579fd6607a4e1d005c86637e7c286e83d6a7df93645bcdbd6f273d2760747ad06f01937b906ee34549e86b6a09cac119e9610f92d82c33
+  data.tar.gz: d88d272042c7638c0b756dc93291148f26fc9dccda7909d4e5f3b16945f43a811e8ae8cc8e7e43a9f139912bd090a85d731e95ac20823f04af136028f10c0bd8

data/lib/mongoid/kms.rb

@@ -65,7 +65,7 @@ module Mongoid
             kms_context_value_changed?(field_name) # checks if any of the context fields have changed
           encrypted_field_name = self.class.get_encrypted_field_name(field_name)
 
-          if instance_variable_get("@#{field_name}").nil? && kms_context_value_changed?(field_name)
+          if !instance_variable_defined?("@#{field_name}") && kms_context_value_changed?(field_name)
             raw = self.send(encrypted_field_name)
             raw = raw.data if raw.is_a?(Mongoid::Kms.bson_class::Binary)
             value = self.class.decrypt_field(self, field_name, raw, self.class.kms_context_was(self, field_name))
@@ -73,7 +73,7 @@ module Mongoid
             value = send("#{field_name}")
           end
 
-          if value.nil?
+          if value.nil? || value == ""
             self.send("#{encrypted_field_name}=", nil)
           else
             self.send("#{encrypted_field_name}=", Mongoid::Kms.binary_factory(self.class.encrypt_field(self, field_name, value)))
@@ -160,7 +160,9 @@ module Mongoid
         field encrypted_field_name, type: Mongoid::Kms.bson_class::Binary
 
         define_method(field_name) do
-          instance_variable_get("@#{field_name}") || begin
+          if instance_variable_defined?("@#{field_name}")
+            instance_variable_get("@#{field_name}")
+          else
             raw = send("kms_secure_#{field_name}")
             raw = raw.data if raw.is_a?(Mongoid::Kms.bson_class::Binary)
 

data/lib/mongoid/kms/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
 module Kms
-VERSION = "0.0.32"
+VERSION = "0.0.33"
 end
 end

data/spec/lib/mongoid/kms_spec.rb

@@ -19,6 +19,61 @@ describe Mongoid::Kms do
     expect(o.unsecure).to eq("robin")
   end
 
+  it "ingores nil on create" do
+    o = MyClass.new(unsecure: "robin", secure: nil)
+    o.save!
+
+    o = MyClass.find(o.id)
+    expect(o.secure).to be_nil
+    expect(o.unsecure).to eq("robin")
+  end
+
+  it "ingores empty string on create" do
+    o = MyClass.new(unsecure: "robin", secure: "")
+    o.save!
+
+    o = MyClass.find(o.id)
+    expect(o.secure).to be_nil
+    expect(o.unsecure).to eq("robin")
+  end
+
+  it "sets nil on update" do
+    o = MyClass.new(unsecure: "robin", secure: "old-secure-value")
+    o.save!
+
+    o.update_attributes!(secure: nil)
+
+    o = MyClass.find(o.id)
+    expect(o.secure).to be_nil
+    expect(o.unsecure).to eq("robin")
+  end
+
+  it "sets empty string on update" do
+    o = MyClass.new(unsecure: "robin", secure: "old-secure-value")
+    o.save!
+
+    o.secure = ""
+    o.save!
+
+    o = MyClass.find(o.id)
+    expect(o.secure).to be_nil
+    expect(o.unsecure).to eq("robin")
+  end
+
+  it "udpates nil values properly" do
+    o = MyClass.new(unsecure: "robin", secure: nil)
+    o.save!
+
+    o.secure = "batman"
+    o.save!
+
+    o = MyClass.find(o.id)
+    expect(o.secure).to eq("batman")
+    expect(o.unsecure).to eq("robin")
+  end
+
+
+
   it "encrypts the other fields" do
     o = OtherClass.new(unsecure: "pengiun", super_secure: "joker")
     o.save!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-kms
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Chris Winslett