# This is a combination of 5 commits.

# This is the 1st commit message:

141278 - bundle install for nokogiri

141278 - bundle update

141278 - updated Gemfile to include rails 7 support branch for attr_encrypted gem

# This is the commit message #2:

Updated ruby and rails versions

# This is the commit message #3:

Added json initializer to support ruby upgrade

# This is the commit message #4:

Updated uglifier syntax for ruby upgrade

# This is the commit message #5:

Updated before_filter to before_action

Gemfile

@@ -4,7 +4,8 @@ ruby File.read(File.join(File.dirname(__FILE__), ".ruby-version")).strip
 
 gem "rails", "~> 7.0.0"
 
-gem "attr_encrypted"
+#gem "attr_encrypted"
+gem "attr_encrypted", github: "PagerTree/attr_encrypted", branch: "rails-7-0-support"
 gem "bootstrap-sass", "~> 3.3.4"
 gem "bootstrap-scss"
 gem "carrierwave"

Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/PagerTree/attr_encrypted.git
+  revision: df02ab0b9547220b2859317d1af8a4280b0fae44
+  branch: rails-7-0-support
+  specs:
+    attr_encrypted (3.1.0)
+      encryptor (~> 3.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -71,7 +79,7 @@ GEM
     ast (2.4.2)
     attr_encrypted (4.1.0)
       encryptor (~> 3.0.0)
-    autoprefixer-rails (10.4.16.0)
+    autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
     base64 (0.2.0)
     better_errors (2.10.1)
@@ -107,7 +115,8 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    childprocess (5.0.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
     concurrent-ruby (1.3.3)
     crass (1.0.6)
     database_cleaner (2.0.2)
@@ -219,10 +228,6 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    nokogiri (1.14.0-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.14.0-x86_64-linux)
-      racc (~> 1.4)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
@@ -303,7 +308,7 @@ GEM
     regexp_parser (2.9.2)
     request_store (1.7.0)
       rack (>= 1.4)
-    rexml (3.3.2)
+    rexml (3.3.4)
       strscan
     rouge (4.3.0)
     rspec-core (3.13.0)
@@ -332,7 +337,7 @@ GEM
       rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.0)
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
     ruby-vips (2.2.2)
@@ -427,7 +432,7 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  attr_encrypted
+  attr_encrypted!
   better_errors
   bootstrap-sass (~> 3.3.4)
   bootstrap-scss

app/models/secret.rb

@@ -1,8 +1,8 @@
 class Secret < ApplicationRecord
   attr_accessor :secret_key
 
-  #attr_encrypted :secret, key: :secret_key, mode: :per_attribute_iv_and_salt
-  attr_encrypted_encrypted_attributes #:secret, key: :secret_key, mode: :per_attribute_iv_and_salt
+  attr_encrypted :secret, key: :secret_key, mode: :per_attribute_iv_and_salt
+  #attr_encrypted_encrypted_attributes #:secret, key: :secret_key, mode: :per_attribute_iv_and_salt
   mount_uploader :secret_file, SecretFileUploader
 
   validates :from_email, presence: {