mongoid-kms 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 499cdefc517aa05b0369dd7d87778f975fb17221
-  data.tar.gz: 7de75298cea61a9964422ab70080859b4fc2cdbf
+  metadata.gz: 0ef5d00b5940a40440f302133dffa2b364b73a86
+  data.tar.gz: b970e5a37fbf0b68aa52b7a61f7197fdf008d896
 SHA512:
-  metadata.gz: dfca6638b45ad191af3bc5c0d0ee299528b61135659aba78cace8fe4c3268c3ebf207f74b1ba7767eacba93193d21d97f1667488d38a751850c5da570dfdaee2
-  data.tar.gz: 9e90c4ad3dd3aad9cdc81b82f0543b2e22a6dc5f125932c77abd41373d84fdbef29b4596fc73fd63fd923f70e17cbdff236716c920f33e8be8a24cae71e71d80
+  metadata.gz: 9f5c68d2c32a9785209e2138ed795311d103cfa8071fae65875d6a0f1cc9e73b76e0b71a31252b043857ccf9d1a6107c297265a93dbaba36dcd9c64feaa05ac4
+  data.tar.gz: 4ccbbe113dd32f9a9d50aff1e6c2a41a049ebf1afc1be7e54841076d2ce8f292e0d3c037d4e712dda5db10dfd60cff68993b2a8c19ee6c89ea026d48d2edb035

data/lib/mongoid/kms/version.rb

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

data/lib/mongoid/kms.rb

@@ -7,7 +7,8 @@ module Mongoid
     extend ActiveSupport::Concern
 
     included do
-      @kms_field_map ||= {}
+      class_attribute :kms_field_map
+      self.kms_field_map ||= {}
 
       unless self.ancestors.include?(ActiveModel::Dirty)
         include ActiveModel::Dirty
@@ -79,10 +80,47 @@ module Mongoid
 
     # Class methods
     module ClassMethods
-      def kms_field_map
-        @kms_field_map
+      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
+      end
+
+
       def encrypt_field(object, field_name, value)
         Mongoid::Kms.kms.encrypt({
           key_id: Mongoid::Kms.key,
@@ -128,11 +166,11 @@ module Mongoid
       end
 
       def kms_context_array(object, field_name)
-        @kms_field_map[field_name.to_s][:context] || []
+        kms_field_map[field_name.to_s][:context] || []
       end
 
       def kms_type(field_name)
-        @kms_field_map[field_name.to_s][:type]
+        kms_field_map[field_name.to_s][:type]
       end
 
       def get_encrypted_field_name(field_name)
@@ -140,33 +178,7 @@ module Mongoid
       end
 
       def secure_field(field_name, args)
-        encrypted_field_name = get_encrypted_field_name(field_name)
-
-        @kms_field_map[field_name.to_s] = {context: args.delete(:context), type: args.delete(:type)}
-
-        field encrypted_field_name, args.merge(type: Mongoid::Kms.bson_class::Binary)
-
-        define_attribute_methods field_name.to_sym
-        before_save :set_kms_values
-
-        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
+        add_secure_field(field_name, args)
       end
     end
 

data/spec/lib/mongoid/kms_spec.rb

@@ -52,4 +52,14 @@ describe Mongoid::Kms do
     expect{Mongoid::Kms.configure({region: "", key: ""})}.to raise_error(Mongoid::Kms::Errors::ConfigurationError, "Region and KMS id key are required.")
   end
 
+  it "works with extended classes" 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
+
 end

data/spec/spec_helper.rb

@@ -30,4 +30,8 @@ class ClassWithoutContext
   field :unsecure
 end
 
+class ExtendedClass < OtherClass
+  secure_field :additional_secure, type: String, context: [:unsecure, :timestamp]
+end
+
 Mongoid::Kms.configure({region: "us-east-1", key: ENV['AWS_KMS_KEY_ID']})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-kms
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Chris Winslett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid