lib/symmetric_encryption/config.rb in symmetric-encryption-4.3.1 vs lib/symmetric_encryption/config.rb in symmetric-encryption-4.3.2

@@ -1,7 +1,7 @@
-require 'erb'
-require 'yaml'
+require "erb"
+require "yaml"
 module SymmetricEncryption
   class Config
     attr_reader :file_name, :env
 
     # Load the Encryption Configuration from a YAML file.
@@ -36,57 +36,58 @@
     # Write the entire configuration for all environments to the supplied file name.
     def self.write_file(file_name, config)
       config = deep_stringify_keys(config)
 
       FileUtils.mkdir_p(File.dirname(file_name))
-      File.open(file_name, 'w') do |f|
-        f.puts '# This file was auto generated by symmetric-encryption.'
-        f.puts '# Recommend using symmetric-encryption to make changes.'
-        f.puts '# For more info, run:'
-        f.puts '#   symmetric-encryption --help'
-        f.puts '#'
+      File.open(file_name, "w") do |f|
+        f.puts "# This file was auto generated by symmetric-encryption."
+        f.puts "# Recommend using symmetric-encryption to make changes."
+        f.puts "# For more info, run:"
+        f.puts "#   symmetric-encryption --help"
+        f.puts "#"
         f.write(config.to_yaml)
       end
     end
 
     # Load the Encryption Configuration from a YAML file.
     #
     # See: `.load!` for parameters.
     def initialize(file_name: nil, env: nil)
-      env ||= defined?(Rails) ? Rails.env : ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
+      env ||= defined?(Rails) ? Rails.env : ENV["RACK_ENV"] || ENV["RAILS_ENV"] || "development"
 
       unless file_name
-        root          = defined?(Rails) ? Rails.root : '.'
-        file_name     =
-          if (env_var = ENV['SYMMETRIC_ENCRYPTION_CONFIG'])
+        root      = defined?(Rails) ? Rails.root : "."
+        file_name =
+          if (env_var = ENV["SYMMETRIC_ENCRYPTION_CONFIG"])
             File.expand_path(env_var)
           else
-            File.join(root, 'config', 'symmetric-encryption.yml')
+            File.join(root, "config", "symmetric-encryption.yml")
           end
         raise(ConfigError, "Cannot find config file: #{file_name}") unless File.exist?(file_name)
       end
 
       @env       = env
       @file_name = file_name
     end
 
     # Returns [Hash] the configuration for the supplied environment.
     def config
-      @config ||= begin
-        raise(ConfigError, "Cannot find config file: #{file_name}") unless File.exist?(file_name)
+      @config ||=
+        begin
+          raise(ConfigError, "Cannot find config file: #{file_name}") unless File.exist?(file_name)
 
-        env_config = YAML.load(ERB.new(File.new(file_name).read).result)[env]
-        raise(ConfigError, "Cannot find environment: #{env} in config file: #{file_name}") unless env_config
+          env_config = YAML.load(ERB.new(File.new(file_name).read).result)[env]
+          raise(ConfigError, "Cannot find environment: #{env} in config file: #{file_name}") unless env_config
 
-        env_config = self.class.send(:deep_symbolize_keys, env_config)
-        self.class.send(:migrate_old_formats!, env_config)
-      end
+          env_config = self.class.send(:deep_symbolize_keys, env_config)
+          self.class.send(:migrate_old_formats!, env_config)
+        end
     end
 
     # Returns [Array(SymmetricEncrytion::Cipher)] ciphers specified in the configuration file.
     def ciphers
-      @ciphers ||= config[:ciphers].collect { |cipher_config| Cipher.from_config(cipher_config) }
+      @ciphers ||= config[:ciphers].collect { |cipher_config| Cipher.from_config(**cipher_config) }
     end
 
     # Iterate through the Hash symbolizing all keys.
     def self.deep_symbolize_keys(object)
       case object
@@ -127,36 +128,36 @@
 
     # Migrate old configuration format for this environment
     def self.migrate_old_formats!(config)
       # Inline single cipher before :ciphers
       unless config.key?(:ciphers)
-        inline_cipher                               = {}
+        inline_cipher = {}
         config.keys.each { |key| inline_cipher[key] = config.delete(key) }
-        config[:ciphers]                            = [inline_cipher]
+        config[:ciphers] = [inline_cipher]
       end
 
       # Copy Old :private_rsa_key into each ciphers config
       # Cipher.from_config replaces it with the RSA Kek
       if config[:private_rsa_key]
-        private_rsa_key                                           = config.delete(:private_rsa_key)
+        private_rsa_key = config.delete(:private_rsa_key)
         config[:ciphers].each { |cipher| cipher[:private_rsa_key] = private_rsa_key }
       end
 
       # Old :cipher_name
       config[:ciphers].each do |cipher|
         if (old_key_name_cipher = cipher.delete(:cipher))
-          cipher[:cipher_name]  = old_key_name_cipher
+          cipher[:cipher_name] = old_key_name_cipher
         end
 
         # Only temporarily used during v4 Beta process
         cipher[:private_rsa_key] = cipher.delete(:key_encrypting_key) if cipher[:key_encrypting_key].is_a?(String)
 
         # Check for a prior env var in encrypted key
         # Example:
         #   encrypted_key: <%= ENV['VAR'] %>
         if cipher.key?(:encrypted_key) && cipher[:encrypted_key].nil?
           cipher[:key_env_var] = :placeholder
-          puts 'WARNING: :encrypted_key resolved to nil. Please see the migrated config file for the new option :key_env_var.'
+          puts "WARNING: :encrypted_key resolved to nil. Please see the migrated config file for the new option :key_env_var."
         end
       end
       config
     end