attr_keyring 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6057a2d9269b3ae803d4a0b83687ef89d5ca9dff7b9570711b433b0c7a9b7f58
-  data.tar.gz: e43bda559349979df6e77fef9a17c3f81e5ad96d9dde229ca82c4d781555ee24
+  metadata.gz: 4a80344a57c60c546692d38f9d117129a9ad8f6ab796247de5a6188bbdddbd7a
+  data.tar.gz: 5842f654124fcd2de9c409b3464ff36b029a79dc19f2be973fabafb316f139ed
 SHA512:
-  metadata.gz: 914e18b4fefad514bc4b1d4a802ac213308348e0512e6c8daadffc40327e7aec20ec80064dd98b85140d75bea81ab099ae2da6d8856d377dbb5573e7458ffdd2
-  data.tar.gz: '08410c37300a6cb5156a6b8f1e00bf8f3c01b9729fb0840c98c83c0cb275e015a9cbde54ad91859e8a8f4f7ede86d2fa4f46526c38a769655c381c8bcfafd7c3'
+  metadata.gz: a734ba2ae31db2ee0875d1cde94184a389f319242f01bce6cce70b561ba14e7075c7926dd8b82bd313bacbcdbb8148e7ddf2f91a46a532065e85d79a18db4fd7
+  data.tar.gz: 47499f9c934a7956588586c27fb07a6a913d8d658ee46a3d6b8d619af2e8df2af4a4d2fdc01cf6e749139c774d0aabe8ecac51ab6ff0d6b9e0e9f32821b97416

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    attr_keyring (0.2.1)
+    attr_keyring (0.2.2)
       activerecord
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.1.1)
-      activesupport (= 5.2.1.1)
-    activerecord (5.2.1.1)
-      activemodel (= 5.2.1.1)
-      activesupport (= 5.2.1.1)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
       arel (>= 9.0)
-    activesupport (5.2.1.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)

data/lib/attr_keyring.rb

@@ -19,9 +19,21 @@ module AttrKeyring
       extend AttrKeyring::ActiveRecord::ClassMethods
       include AttrKeyring::ActiveRecord::InstanceMethods
 
-      cattr_accessor :keyring, default: Keyring.new({})
+      class << self
+        attr_accessor :keyring_attrs
+        attr_accessor :keyring
+
+        def inherited(subclass)
+          super
+
+          subclass.keyring_attrs = []
+          subclass.keyring = Keyring.new({})
+        end
+      end
+
       cattr_accessor :keyring_column_name, default: "keyring_id"
-      cattr_accessor :keyring_attrs, default: []
+      self.keyring_attrs = []
+      self.keyring = Keyring.new({})
 
       before_save :migrate_to_latest_encryption_key
     end

data/lib/attr_keyring/active_record.rb

@@ -6,6 +6,7 @@ module AttrKeyring
       end
 
       def attr_encrypt(*attributes)
+        self.keyring_attrs ||= []
         keyring_attrs.push(*attributes)
 
         attributes.each do |attribute|
@@ -19,8 +20,8 @@ module AttrKeyring
           return attr_reset_column(attribute) if value.nil?
 
           stored_keyring_id = public_send(keyring_column_name)
-          keyring_id = stored_keyring_id || keyring.current_key&.id
-          encrypted_value = keyring.encrypt(value, keyring_id)
+          keyring_id = stored_keyring_id || self.class.keyring.current_key&.id
+          encrypted_value = self.class.keyring.encrypt(value, keyring_id)
 
           public_send("#{keyring_column_name}=", keyring_id) unless stored_keyring_id
           public_send("encrypted_#{attribute}=", encrypted_value)
@@ -35,7 +36,7 @@ module AttrKeyring
           return unless encrypted_value
 
           keyring_id = public_send(keyring_column_name)
-          keyring.decrypt(encrypted_value, keyring_id)
+          self.class.keyring.decrypt(encrypted_value, keyring_id)
         end
       end
     end
@@ -53,11 +54,11 @@ module AttrKeyring
       end
 
       private def migrate_to_latest_encryption_key
-        keyring_id = keyring.current_key.id
+        keyring_id = self.class.keyring.current_key.id
 
-        keyring_attrs.each do |attribute|
+        self.class.keyring_attrs.each do |attribute|
           value = public_send(attribute)
-          encrypted_value = keyring.encrypt(value, keyring_id)
+          encrypted_value = self.class.keyring.encrypt(value, keyring_id)
 
           public_send("encrypted_#{attribute}=", encrypted_value)
           attr_encrypt_digest(attribute, value)

data/lib/attr_keyring/version.rb

@@ -1,3 +1,3 @@
 module AttrKeyring
-  VERSION = "0.2.1".freeze
+  VERSION = "0.2.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr_keyring
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord