mongoid-kms 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ef5d00b5940a40440f302133dffa2b364b73a86
-  data.tar.gz: b970e5a37fbf0b68aa52b7a61f7197fdf008d896
+  metadata.gz: 5889640818fefd09ba8da7d2913101709824eb70
+  data.tar.gz: 84db0216fc606c8f566c9e7fb144fff8e9eb4761
 SHA512:
-  metadata.gz: 9f5c68d2c32a9785209e2138ed795311d103cfa8071fae65875d6a0f1cc9e73b76e0b71a31252b043857ccf9d1a6107c297265a93dbaba36dcd9c64feaa05ac4
-  data.tar.gz: 4ccbbe113dd32f9a9d50aff1e6c2a41a049ebf1afc1be7e54841076d2ce8f292e0d3c037d4e712dda5db10dfd60cff68993b2a8c19ee6c89ea026d48d2edb035
+  metadata.gz: 8fd89f03c35e0689906b6e7db35bf41012f784b701b8f5ba6182d3b4cc79e9f33e0567a3c994425a1b56912f1d0c25d50fd6497cf20b37cbfc2f488033a1d790
+  data.tar.gz: 432fd44f6222d35eed8b2491701b5426981869424b5dad7ac978cf3763f30851333e64e6bb40faca6e1a795b0e2503add1153bd6f3fbc5f06218d2c03a4c1bc4

data/lib/mongoid/kms.rb

@@ -82,45 +82,9 @@ module Mongoid
     module ClassMethods
       def inherited(child)
         child.kms_field_map = self.kms_field_map.clone
-
-        child.kms_field_map.each do |field_name, args|
-          child.add_secure_field(field_name, args)
-        end
-      end
-
-      def add_secure_field(field_name, args)
-        encrypted_field_name = get_encrypted_field_name(field_name)
-
-        define_attribute_methods field_name.to_sym
-        before_save :set_kms_values
-
-        kms_field_map[field_name.to_s] = {context: args.delete(:context), type: args[:type]}
-
-        field encrypted_field_name, type: Mongoid::Kms.bson_class::Binary
-
-        self.class_eval do
-          define_method(field_name) do
-            instance_variable_get("@#{field_name}") || begin
-              raw = send("kms_secure_#{field_name}")
-
-              if raw.nil?
-                raw
-              else
-                v = self.class.decrypt_field(self, field_name, raw)
-                instance_variable_set("@#{field_name}", v)
-                v
-              end
-            end
-          end
-
-          define_method("#{field_name}=") do |value|
-            self.send("#{field_name}_will_change!")
-            instance_variable_set("@#{field_name}", value)
-          end
-        end
+        super(child)
       end
 
-
       def encrypt_field(object, field_name, value)
         Mongoid::Kms.kms.encrypt({
           key_id: Mongoid::Kms.key,
@@ -178,7 +142,33 @@ module Mongoid
       end
 
       def secure_field(field_name, args)
-        add_secure_field(field_name, args)
+        encrypted_field_name = get_encrypted_field_name(field_name)
+
+        define_attribute_methods field_name.to_sym
+        before_save :set_kms_values
+
+        kms_field_map[field_name.to_s] = {context: args.delete(:context), type: args[:type]}
+
+        field encrypted_field_name, type: Mongoid::Kms.bson_class::Binary
+
+        define_method(field_name) do
+          instance_variable_get("@#{field_name}") || begin
+            raw = send("kms_secure_#{field_name}")
+
+            if raw.nil?
+              raw
+            else
+              v = self.class.decrypt_field(self, field_name, raw)
+              instance_variable_set("@#{field_name}", v)
+              v
+            end
+          end
+        end
+
+        define_method("#{field_name}=") do |value|
+          self.send("#{field_name}_will_change!")
+          instance_variable_set("@#{field_name}", value)
+        end
       end
     end
 

data/lib/mongoid/kms/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
 module Kms
-VERSION = "0.0.20"
+VERSION = "0.0.21"
 end
 end

data/spec/lib/mongoid/kms_spec.rb

@@ -56,8 +56,6 @@ describe Mongoid::Kms do
     o = ExtendedClass.new(super_secure: "batman", unsecure: "robin", timestamp: Time.now, additional_secure: "wha!")
     o.save!
 
-    byebug
-
     o = ExtendedClass.find(o.id)
     expect(o.additional_secure).to eq("wha!")
   end

metadata

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