umbrellio-sequel-plugins 0.4.0.134 → 0.4.0.145

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61fbe7c339511660a7a6797732df54b1215d84820ba80d97f434076b329ac2af
-  data.tar.gz: a4802265e7bd4ffe9c21b7eaa9ba7d071bf75b81f09d6198412201882f59ede5
+  metadata.gz: d5d5aa7a6f7809d726257495ab1230d6273209e8c8a470df94faadbd0d3c82d3
+  data.tar.gz: 6cd47df601385a03216f20c79158eef81c8a85b1eeeb0ad6f0c15349d5d2f631
 SHA512:
-  metadata.gz: 9ee225f47d644536885adf0f63569c64e0d079abb22faca00415c663ffdaafaf27679eb63af7206dabb4accdfa87fb025e8cacece1e59feaf8ce8bb96fce9d42
-  data.tar.gz: 4f65c05c159e82e6999e463bd2a5c10e1c37110b43d7cec383416c9d6acd90536777740c4b936186f4deade9ece47ef2542f1de63f0ac4620755682820120577
+  metadata.gz: c78976f598b8dc8e22f3ad8f0be33d07833672615bbd60473035d3a4ef0f952053b5f16089b84e99bfc83864f313cc8f18a59b1fae895c8ac6ac1761598001b1
+  data.tar.gz: 502b777950b5bddbca58de8f56550da3f301f8d144e3d4e2420f45f09718592775bfe2116a5333bb2f1e321eeeb4a3d8255cc1e800797c3d4de1aac3fabf46a1

data/README.md

@@ -21,8 +21,8 @@ $ bundle
 - [`PGTools`](#PGTools)
 - [`Slave`](#Slave)
 - [`Synchronize`](#Synchronize)
-- [`methods_in_migrations`](#methods_in_migrations)
-- [`deferrable_foreign_keys`](#deferrable_foreign_keys)
+- [`Methods in Migrations`](#Methods-in-Migrations)
+- [`Deferrable Foreign Keys`](#Deferrable-Foreign-Keys)
 
 # Plugins
 
@@ -225,7 +225,7 @@ end
 
 class Order < Sequel::Model
   attr_encrypted :first_name, :last_name, key: Settings.private_key
-  attr_encrypted :secret_data, key: Settings.another_private_key, json: true
+  attr_encrypted :secret_data, key: Settings.another_private_key
 end
 
 Order.create(first_name: "Ivan")

data/lib/sequel/plugins/attr_encrypted.rb

@@ -3,13 +3,13 @@
 # Creates encrypted attribute storing
 module Sequel::Plugins::AttrEncrypted
   SEPARATOR = "$"
+  require "sequel/plugins/attr_encrypted/simple_crypt"
 
   module ClassMethods
     # Setup attr encrypted
     #
     # @param attrs [Array<Symbol>] column names
     # @param key [String] 32 bytes key
-    # @param json [Boolean] store attribute as json or not
     # @example
     #   Sequel.migration do
     #     change do
@@ -23,7 +23,7 @@ module Sequel::Plugins::AttrEncrypted
     #
     #   class Order < Sequel::Model
     #     attr_encrypted :first_name, :last_name, key: Settings.private_key
-    #     attr_encrypted :secret_data, key: Settings.another_private_key, json: true
+    #     attr_encrypted :secret_data, key: Settings.another_private_key
     #   end
 
     #   Order.create(first_name: "Ivan")
@@ -34,34 +34,36 @@ module Sequel::Plugins::AttrEncrypted
     #                        secret_data: { "some_key" => "Some Value" })
     #   order.reload
     #   order.first_name # => "Ivan"
+    #   order.last_name # => "Smith"
     #   order.secret_data # => { "some_key" => "Some Value" }
-    def attr_encrypted(*attrs, key:, json: false)
+    def attr_encrypted(*attrs, key:)
       include_encrypted_module!
       attrs.each do |attr|
-        define_encrypted_setter(attr, key, json)
-        define_encrypted_getter(attr, key, json)
+        define_encrypted_setter(attr, key)
+        define_encrypted_getter(attr, key)
+        @_encrypted_attributes << attr
       end
     end
 
     private
 
-    def define_encrypted_setter(attr, key, json)
+    def define_encrypted_setter(attr, key)
       @_attr_encrypted_module.module_eval do
         define_method("#{attr}=") do |value|
           instance_variable_set("@#{attr}", value)
 
-          send("encrypted_#{attr}=", SimpleCrypt.encrypt(json ? value.to_json : value, key))
+          send("encrypted_#{attr}=", SimpleCrypt.encrypt(value.to_json, key))
         end
       end
     end
 
-    def define_encrypted_getter(attr, key, json)
+    def define_encrypted_getter(attr, key)
       @_attr_encrypted_module.module_eval do
         define_method(attr.to_s) do
           instance_variable_get("@#{attr}") || begin
             decrypted = SimpleCrypt.decrypt(send("encrypted_#{attr}"), key)
 
-            result = json && !decrypted.nil? ? JSON.parse(decrypted) : decrypted
+            result = !decrypted.nil? ? JSON.parse(decrypted) : decrypted
             instance_variable_set("@#{attr}", result)
           end
         end
@@ -71,8 +73,19 @@ module Sequel::Plugins::AttrEncrypted
     def include_encrypted_module!
       return if defined?(@_attr_encrypted_module)
 
+      @_encrypted_attributes ||= []
       @_attr_encrypted_module = Module.new
       prepend @_attr_encrypted_module
     end
   end
+
+  module InstanceMethods
+    def reload
+      self.class.instance_variable_get(:@_encrypted_attributes)&.each do |attr|
+        instance_variable_set("@#{attr}", nil)
+      end
+
+      super
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-sequel-plugins
 version: !ruby/object:Gem::Version
-  version: 0.4.0.134
+  version: 0.4.0.145
 platform: ruby
 authors:
 - nulldef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel