lockbox 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ba8d72d01b0dd6f8562bfb0980f9131e3670378299de01762cfefb6dd808857
-  data.tar.gz: ace013580f48bb9c0950f2393726ff8a05923e626babdc9102a89bc6bd5c5043
+  metadata.gz: 775a12c813fb58a8e3a7f799d85af74d8a461b8cb6578beb672919dd1a4030f2
+  data.tar.gz: 41ab60ea29776ade74d0300ce4f933a0dc10e8f07c20bf48c2e604cab0aa4c13
 SHA512:
-  metadata.gz: 29c1efa284ef09cb81e30bbc26b0f53a29793412e5f6983dd47af8a2b4258c56449cfd9f3410218b354abf56f655cbde33e60f6f5b2ef03037c32cfa258685f2
-  data.tar.gz: a8d52b8a2a650bfe6c792c68b89dade741913081f10cda760dd76ccf74bbf5c6ac282b87fd02380eb4eff2899caba591fec1a95e325819f7688baa7cedfc081f
+  metadata.gz: 1208cd3e38d59425f09db7d2830b7f69809d6ae601b2b59d232001325d1721fad3087683eb44690d8ad672cd2c9c8adc22cae283ed1f56c31d906d3ed4bcaee2
+  data.tar.gz: 02e1faac0de9a9d8fcf168e01474792b5c9275fab7006f7e6fd4668dcae22a0b5e716bd983324104b66b4dd4ef55aede488f341f04bd7039a085ffb798f0b35d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.1 (2019-12-26)
+
+- Fixed encoding for `encrypt_io` and `decrypt_io` in Ruby 2.7
+- Fixed deprecation warnings in Ruby 2.7
+
 ## 0.3.0 (2019-12-22)
 
 - Added support for custom types

data/lib/lockbox.rb

@@ -20,10 +20,13 @@ require "lockbox/railtie" if defined?(Rails)
 if defined?(ActiveSupport)
   ActiveSupport.on_load(:active_record) do
     extend Lockbox::Model
+    extend Lockbox::Model::Attached
   end
 
   ActiveSupport.on_load(:mongoid) do
     Mongoid::Document::ClassMethods.include(Lockbox::Model)
+    # TODO remove in 0.4.0
+    Mongoid::Document::ClassMethods.include(Lockbox::Model::Attached)
   end
 end
 
@@ -79,7 +82,6 @@ module Lockbox
     str.unpack("H*").first
   end
 
-  # legacy
   def self.new(**options)
     Encryptor.new(**options)
   end

data/lib/lockbox/encryptor.rb

@@ -5,8 +5,8 @@ module Lockbox
       previous_versions = options.delete(:previous_versions)
 
       @boxes =
-        [Box.new(options)] +
-        Array(previous_versions).map { |v| Box.new({key: options[:key]}.merge(v)) }
+        [Box.new(**options)] +
+        Array(previous_versions).map { |v| Box.new(key: options[:key], **v) }
     end
 
     def encrypt(message, **options)
@@ -74,6 +74,7 @@ module Lockbox
           File.basename(source.path)
         end
       target.content_type = source.content_type if source.respond_to?(:content_type)
+      target.set_encoding(source.external_encoding) if source.respond_to?(:external_encoding)
     end
 
     # legacy for attr_encrypted

data/lib/lockbox/model.rb

@@ -1,36 +1,5 @@
 module Lockbox
   module Model
-    def attached_encrypted(attribute, **options)
-      warn "[lockbox] DEPRECATION WARNING: Use encrypts_attached instead"
-      encrypts_attached(attribute, **options)
-    end
-
-    def encrypts_attached(*attributes, **options)
-      attributes.each do |name|
-        name = name.to_sym
-
-        class_eval do
-          @lockbox_attachments ||= {}
-
-          if @lockbox_attachments.empty?
-            def self.lockbox_attachments
-              parent_attachments =
-                if superclass.respond_to?(:lockbox_attachments)
-                  superclass.lockbox_attachments
-                else
-                  {}
-                end
-
-              parent_attachments.merge(@lockbox_attachments || {})
-            end
-          end
-
-          raise "Duplicate encrypted attachment: #{name}" if lockbox_attachments[name]
-          @lockbox_attachments[name] = options
-        end
-      end
-    end
-
     def encrypts(*attributes, **options)
       # support objects
       # case options[:type]
@@ -271,6 +240,7 @@ module Lockbox
             table = activerecord ? table_name : collection_name.to_s
 
             unless message.nil?
+              # TODO use attribute type class in 0.4.0
               case options[:type]
               when :boolean
                 message = ActiveRecord::Type::Boolean.new.serialize(message)
@@ -327,6 +297,7 @@ module Lockbox
               end
 
             unless message.nil?
+              # TODO use attribute type class in 0.4.0
               case options[:type]
               when :boolean
                 message = message == "t"
@@ -363,5 +334,39 @@ module Lockbox
         end
       end
     end
+
+    module Attached
+      def encrypts_attached(*attributes, **options)
+        attributes.each do |name|
+          name = name.to_sym
+
+          class_eval do
+            @lockbox_attachments ||= {}
+
+            if @lockbox_attachments.empty?
+              def self.lockbox_attachments
+                parent_attachments =
+                  if superclass.respond_to?(:lockbox_attachments)
+                    superclass.lockbox_attachments
+                  else
+                    {}
+                  end
+
+                parent_attachments.merge(@lockbox_attachments || {})
+              end
+            end
+
+            raise "Duplicate encrypted attachment: #{name}" if lockbox_attachments[name]
+            @lockbox_attachments[name] = options
+          end
+        end
+      end
+
+      # TODO remove in future version
+      def attached_encrypted(attribute, **options)
+        warn "[lockbox] DEPRECATION WARNING: Use encrypts_attached instead"
+        encrypts_attached(attribute, **options)
+      end
+    end
   end
 end

data/lib/lockbox/utils.rb

@@ -14,7 +14,7 @@ module Lockbox
         options[:key] = Lockbox.attribute_key(table: table, attribute: attribute, master_key: options.delete(:master_key))
       end
 
-      Lockbox.new(options)
+      Lockbox.new(**options)
     end
 
     def self.encrypted_options(record, name)

data/lib/lockbox/version.rb

@@ -1,3 +1,3 @@
 module Lockbox
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockbox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-22 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Modern encryption for Rails