lockbox 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 767467c10e8b38cc53b822c604bc4d6189563a00b7a53a12181ac5d3de19e723
-  data.tar.gz: 56319f892b400761e11a96b9f0e05f3a5cf684c6b6f069e9f85cbbdd81299bef
+  metadata.gz: 860bb7bcddfde22f980e11185c2afae0453e6547064d4538024a16f7652f953d
+  data.tar.gz: 5c97a4bcde5621234bf3f832d0c4a2eb7ca2a986541cb203b6370170141fe29b
 SHA512:
-  metadata.gz: 8e4550edc543add59495e42f0648b80c538ace8d326c12acbe5bad3bfb907f329d1ff63be86406bad83f8a2732b2938efa6ce6e20bce9b2d10406f173ee3e56b
-  data.tar.gz: 7087087f6307212b8b041c1703f4d08be578042295a4dcd91efdc1aaab17d1a4c8f2066969ae1837216d746ac3824f287f5fdcbb58afd8a12ce772bf7592d5b9
+  metadata.gz: f1435f9cd4dac0ea8bbee39d787c2a28c73b72a3de260759c27a5bc6c53f2c2fb344f144fa391742f3415baf7a0ea183e683353773c0eb305e145f1084d11918
+  data.tar.gz: 7623133737e4e465a3c63a0c5bbec337382fcce37469e9685a77578af02218d82b5988a057d3b9dc1d7c1accc9de84014ec9bf32d5ac1f0bc8d15455a80c392c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.0 (2022-10-09)
+
+- Added support for `insert`, `insert_all`, `insert_all!`, `upsert`, and `upsert_all`
+
 ## 1.0.0 (2022-06-11)
 
 - Deprecated `encrypts` in favor of `has_encrypted` to avoid conflicting with Active Record encryption

data/README.md

@@ -738,7 +738,7 @@ end
 Make it the default with:
 
 ```ruby
-Lockbox.default_options = {algorithm: "xsalsa20"}
+Lockbox.default_options[:algorithm] = "xsalsa20"
 ```
 
 You can also pass an algorithm to `previous_versions` for key rotation.
@@ -1048,66 +1048,6 @@ User.with_attached_license.find_each do |user|
 end
 ```
 
-### 0.3.6
-
-0.3.6 makes content type detection more reliable for Active Storage. You can check and update the content type of existing files with:
-
-```ruby
-User.with_attached_license.find_each do |user|
-  next unless user.license.attached?
-
-  license = user.license
-  content_type = Marcel::MimeType.for(license.download, name: license.filename.to_s)
-  if content_type != license.content_type
-    license.update!(content_type: content_type)
-  end
-end
-```
-
-### 0.2.0
-
-0.2.0 brings a number of improvements. Here are a few to be aware of:
-
-- Added `encrypts` method for database fields
-- Added support for XSalsa20
-- `attached_encrypted` is deprecated in favor of `encrypts_attached`.
-
-#### Optional
-
-To switch to a master key, generate a key:
-
-```ruby
-Lockbox.generate_key
-```
-
-And set `ENV["LOCKBOX_MASTER_KEY"]` or `Lockbox.master_key`.
-
-Update your model:
-
-```ruby
-class User < ApplicationRecord
-  encrypts_attached :license, previous_versions: [{key: key}]
-end
-```
-
-New uploads will be encrypted with the new key.
-
-You can rotate existing records with:
-
-```ruby
-User.unscoped.find_each do |user|
-  user.license.rotate_encryption!
-end
-```
-
-Once that’s complete, update your model:
-
-```ruby
-class User < ApplicationRecord
-  encrypts_attached :license
-end
-```
-
 ## History
 
 View the [changelog](https://github.com/ankane/lockbox/blob/master/CHANGELOG.md)

data/lib/lockbox/model.rb

@@ -226,6 +226,52 @@ module Lockbox
 
                 result
               end
+
+              if ActiveRecord::VERSION::MAJOR >= 6
+                def self.insert_all(attributes, **options)
+                  super(lockbox_map_attributes(attributes), **options)
+                end
+
+                def self.insert_all!(attributes, **options)
+                  super(lockbox_map_attributes(attributes), **options)
+                end
+
+                def self.upsert_all(attributes, **options)
+                  super(lockbox_map_attributes(attributes, check_readonly: true), **options)
+                end
+
+                # private
+                # does not try to handle :returning option for simplicity
+                def self.lockbox_map_attributes(records, check_readonly: false)
+                  return records unless records.is_a?(Array)
+
+                  records.map do |attributes|
+                    # transform keys like Active Record
+                    attributes = attributes.transform_keys do |key|
+                      n = key.to_s
+                      attribute_aliases[n] || n
+                    end
+
+                    lockbox_attributes = self.lockbox_attributes.slice(*attributes.keys.map(&:to_sym))
+                    lockbox_attributes.each do |key, lockbox_attribute|
+                      attribute = key.to_s
+                      # check read only
+                      # users should mark both plaintext and ciphertext columns
+                      if check_readonly && readonly_attributes.include?(attribute) && !readonly_attributes.include?(lockbox_attribute[:encrypted_attribute].to_s)
+                        warn "[lockbox] WARNING: Mark attribute as readonly: #{lockbox_attribute[:encrypted_attribute]}"
+                      end
+
+                      message = attributes[attribute]
+                      attributes.delete(attribute) unless lockbox_attribute[:migrating]
+                      encrypted_attribute = lockbox_attribute[:encrypted_attribute]
+                      ciphertext = send("generate_#{encrypted_attribute}", message)
+                      attributes[encrypted_attribute] = ciphertext
+                    end
+
+                    attributes
+                  end
+                end
+              end
             else
               def reload
                 self.class.lockbox_attributes.each do |_, v|

data/lib/lockbox/version.rb

@@ -1,3 +1,3 @@
 module Lockbox
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockbox
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-12 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies: []
 description:
 email: andrew@ankane.org