chamber 2.14.3 → 3.0.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08e636d1674a305c9d330e9adf5be147b1e5c2d2c57f131da98a216e3d3b3111'
-  data.tar.gz: 7848e6ca2e2e4de843eedc65f9ca5315c18e71f9a8a2ba67a37c0ea46930a482
+  metadata.gz: 9de7c74ea902d381006bd6b5f05bae3680d1beef940ae75e483f30c923bc310f
+  data.tar.gz: b6f45eb5b668a5964e898ffb4caa5b9a3e9bc227736dd0e687e257cff0c99f84
 SHA512:
-  metadata.gz: 8337ba8c0c7cc899f40bb712a455e5ee56e878ed11f6258e0917863acf194b4cac1a4b11ff087a4c72ed7e5550972fc2d097dafd5b26492a40c8094bd33a744a
-  data.tar.gz: 27b49b8592d343b050491f2a2d22cbd69323989ac031abc9d6a2bf375a30887cd16580d9c76259a4475c9f42d6603aa73769754b454bbfa55bac98e493ae9c3b
+  metadata.gz: b1ab7fedfaf6cb26ab3e97402966368f3e686751ca76e441a7d9db64b7fe354a289ac4ac330cac806fb7960f3b4750c1ce4f7799e548c4f0f549ee57826e8552
+  data.tar.gz: 64cfa0683ca78d71cd620e38e60c4d2c25683c5217d74858995b2ee65eda704f7d2aca9395451ac743424bd75b8974ee088ed3563e192be5ab057f49ad458165

data/lib/chamber/binary/circle_ci.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'chamber/core_ext/hash'
 require 'chamber/commands/cloud/clear'
 require 'chamber/commands/cloud/push'
 require 'chamber/commands/cloud/pull'

data/lib/chamber/binary/heroku.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'chamber/core_ext/hash'
 require 'chamber/commands/cloud/clear'
 require 'chamber/commands/cloud/push'
 require 'chamber/commands/cloud/pull'

data/lib/chamber/binary/runner.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'chamber/core_ext/hash'
 require 'chamber/rubinius_fix'
 require 'chamber/binary/travis'
 require 'chamber/binary/heroku'

data/lib/chamber/binary/travis.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'chamber/core_ext/hash'
 require 'chamber/commands/travis/secure'
 
 module  Chamber

data/lib/chamber/commands/initialize.rb

@@ -194,7 +194,7 @@ class   Initialize < Chamber::Commands::Base
       .chamber*.enc.pass
       !.chamber*.pub.pem
     }.each do |pattern|
-      unless gitignore_contents =~ Regexp.new(Regexp.escape(pattern))
+      unless gitignore_contents&.match?(Regexp.new(Regexp.escape(pattern)))
         shell.append_to_file gitignore_filepath, "#{pattern}\n"
       end
     end

data/lib/chamber/encryption_methods/public_key.rb

@@ -2,55 +2,41 @@
 
 require 'base64'
 
+require 'chamber/errors/disallowed_class'
+
 module  Chamber
 module  EncryptionMethods
 class   PublicKey
-  def self.encrypt(_key, value, encryption_key)
+  def self.encrypt(_settings_key, value, encryption_key)
     value            = YAML.dump(value)
     encrypted_string = encryption_key.public_encrypt(value)
 
     Base64.strict_encode64(encrypted_string)
   end
 
-  def self.decrypt(_key, value, decryption_key)
-    if decryption_key.nil?
-      value
-    else
-      decoded_string    = Base64.strict_decode64(value)
-      unencrypted_value = decryption_key.private_decrypt(decoded_string)
-
-      begin
-        _unserialized_value = begin
-                                YAML.safe_load(unencrypted_value,
-                                               aliases:           true,
-                                               permitted_classes: [
-                                                                    ::Date,
-                                                                    ::Time,
-                                                                    ::Regexp,
-                                                                  ])
-                              rescue ::Psych::DisallowedClass => error
-                                warn <<-HEREDOC
-WARNING: Recursive data structures (complex classes) being loaded from Chamber
-has been deprecated and will be removed in 3.0.
-
-See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#limiting-complex-classes
-for full details.
-
-#{error.message}
-
-Called from: '#{caller.to_a[8]}'
-                                HEREDOC
-
-                                if YAML.respond_to?(:unsafe_load)
-                                  YAML.unsafe_load(unencrypted_value)
-                                else
-                                  YAML.load(unencrypted_value)
-                                end
-                              end
-      rescue TypeError
-        unencrypted_value
-      end
-    end
+  def self.decrypt(_settings_key, value, decryption_key)
+    return value if decryption_key.nil?
+
+    decoded_string    = ::Base64.strict_decode64(value)
+    unencrypted_value = decryption_key.private_decrypt(decoded_string)
+
+    ::YAML.safe_load(unencrypted_value,
+                     aliases:           true,
+                     permitted_classes: [
+                                          ::Date,
+                                          ::Time,
+                                          ::Regexp,
+                                        ])
+  rescue ::Psych::DisallowedClass => error
+    raise ::Chamber::Errors::DisallowedClass, <<~HEREDOC
+      #{error.message}
+
+      You attempted to load a class instance via your Chamber settings that is not allowed.
+
+      See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#limiting-complex-classes for full details.
+    HEREDOC
+  rescue ::TypeError
+    unencrypted_value
   end
 end
 end

data/lib/chamber/encryption_methods/ssl.rb

@@ -16,7 +16,7 @@ class   Ssl
                                 \z
                               /x.freeze
 
-  def self.encrypt(_key, value, encryption_keys) # rubocop:disable Metrics/AbcSize
+  def self.encrypt(_settings_key, value, encryption_keys) # rubocop:disable Metrics/AbcSize
     value         = YAML.dump(value)
     cipher        = OpenSSL::Cipher.new('AES-128-CBC')
     cipher.encrypt
@@ -35,64 +35,46 @@ class   Ssl
     Base64.strict_encode64(encrypted_data)
   end
 
-  def self.decrypt(key, value, decryption_keys) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
-    if decryption_keys.nil?
-      value
-    else
-      key, iv, decoded_string = value
-                                  .match(LARGE_DATA_STRING_PATTERN)
-                                  .captures
-                                  .map do |part|
-        Base64.strict_decode64(part)
-      end
-      key                     = decryption_keys.private_decrypt(key)
+  def self.decrypt(_settings_key, value, decryption_keys) # rubocop:disable Metrics/AbcSize
+    return value if decryption_keys.nil?
 
-      cipher_dec = OpenSSL::Cipher.new('AES-128-CBC')
-
-      cipher_dec.decrypt
+    key, iv, decoded_string = value
+                                .match(LARGE_DATA_STRING_PATTERN)
+                                .captures
+                                .map do |part|
+                                  ::Base64.strict_decode64(part)
+                                end
+    key                     = decryption_keys.private_decrypt(key)
 
-      cipher_dec.key = key
-      cipher_dec.iv  = iv
+    cipher_dec = ::OpenSSL::Cipher.new('AES-128-CBC')
 
-      begin
-        unencrypted_value = cipher_dec.update(decoded_string) + cipher_dec.final
-      rescue OpenSSL::Cipher::CipherError
-        raise Chamber::Errors::DecryptionFailure,
-              'A decryption error occurred. It was probably due to invalid key data.'
-      end
+    cipher_dec.decrypt
 
-      begin
-        _unserialized_value = begin
-                                YAML.safe_load(unencrypted_value,
-                                               aliases:           true,
-                                               permitted_classes: [
-                                                                    ::Date,
-                                                                    ::Time,
-                                                                    ::Regexp,
-                                                                  ])
-                              rescue ::Psych::DisallowedClass => error
-                                warn <<-HEREDOC
-WARNING: Recursive data structures (complex classes) being loaded from Chamber
-has been deprecated and will be removed in 3.0.
+    cipher_dec.key = key
+    cipher_dec.iv  = iv
 
-See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#limiting-complex-classes
-for full details.
+    unencrypted_value = cipher_dec.update(decoded_string) + cipher_dec.final
 
-#{error.message}
+    ::YAML.safe_load(unencrypted_value,
+                     aliases:           true,
+                     permitted_classes: [
+                                          ::Date,
+                                          ::Time,
+                                          ::Regexp,
+                                        ])
+  rescue ::OpenSSL::Cipher::CipherError
+    raise ::Chamber::Errors::DecryptionFailure,
+          'A decryption error occurred. It was probably due to invalid key data.'
+  rescue ::Psych::DisallowedClass => error
+    raise ::Chamber::Errors::DisallowedClass, <<~HEREDOC
+      #{error.message}
 
-Called from: '#{caller.to_a[8]}'
-                                HEREDOC
+      You attempted to load a class instance via your Chamber settings that is not allowed.
 
-                                if YAML.respond_to?(:unsafe_load)
-                                  YAML.unsafe_load(unencrypted_value)
-                                else
-                                  YAML.load(unencrypted_value)
-                                end
-                              end
-      rescue TypeError
-        unencrypted_value
-      end
-    end
+      See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#limiting-complex-classes for full details.
+    HEREDOC
+  rescue ::TypeError
+    unencrypted_value
   end
 end
 end

data/lib/chamber/errors/disallowed_class.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module  Chamber
+module  Errors
+class   DisallowedClass < ::Psych::DisallowedClass
+end
+end
+end

data/lib/chamber/file.rb

@@ -139,38 +139,26 @@ class   File < Pathname
     @secure_prefix_pattern ||= Regexp.escape(secure_prefix)
   end
 
-  def file_contents_hash # rubocop:disable Metrics/CyclomaticComplexity
+  def file_contents_hash
     file_contents = read
-    erb_result    = ERB.new(file_contents).result
+    erb_result    = ::ERB.new(file_contents).result
 
-    begin
-      YAML.safe_load(erb_result,
+    ::YAML.safe_load(erb_result,
                      aliases:           true,
                      permitted_classes: [
                                           ::Date,
                                           ::Time,
                                           ::Regexp,
                                         ]) || {}
-    rescue ::Psych::DisallowedClass => error
-      warn <<-HEREDOC
-WARNING: Recursive data structures (complex classes) being loaded from Chamber
-has been deprecated and will be removed in 3.0.
+  rescue ::Psych::DisallowedClass => error
+    raise ::Chamber::Errors::DisallowedClass, <<~HEREDOC
+      #{error.message}
 
-See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#limiting-complex-classes
-for full details.
+      You attempted to load a class instance via your Chamber settings that is not allowed.
 
-#{error.message}
-
-Called from: '#{caller.to_a[2]}'
-      HEREDOC
-
-      if YAML.respond_to?(:unsafe_load)
-        YAML.unsafe_load(erb_result) || {}
-      else
-        YAML.load(erb_result) || {}
-      end
-    end
-  rescue Errno::ENOENT
+      See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#limiting-complex-classes for full details.
+    HEREDOC
+  rescue ::Errno::ENOENT
     {}
   end
 end

data/lib/chamber/files/signature.rb

@@ -42,13 +42,13 @@ class  Signature
   end
 
   def write
-    signature_filename.write(<<-HEREDOC, 0, mode: 'w+')
-Signed By: #{signature_name}
-Signed At: #{Time.now.utc.iso8601}
+    signature_filename.write(<<~HEREDOC, 0, mode: 'w+')
+      Signed By: #{signature_name}
+      Signed At: #{Time.now.utc.iso8601}
 
-#{SIGNATURE_HEADER}
-#{encoded_signature}
-#{SIGNATURE_FOOTER}
+      #{SIGNATURE_HEADER}
+      #{encoded_signature}
+      #{SIGNATURE_FOOTER}
     HEREDOC
   end
 

data/lib/chamber/filters/decryption_filter.rb

@@ -2,16 +2,18 @@
 
 require 'openssl'
 require 'base64'
-require 'hashie/mash'
 require 'yaml'
 require 'chamber/encryption_methods/public_key'
 require 'chamber/encryption_methods/ssl'
 require 'chamber/encryption_methods/none'
 require 'chamber/errors/decryption_failure'
+require 'chamber/refinements/deep_dup'
 
 module  Chamber
 module  Filters
 class   DecryptionFilter
+  using ::Chamber::Refinements::DeepDup
+
   BASE64_STRING_PATTERN     = %r{\A[A-Za-z0-9+/]{342}==\z}.freeze
   LARGE_DATA_STRING_PATTERN = %r{
                                   \A                            # Beginning of String
@@ -34,8 +36,8 @@ class   DecryptionFilter
   attr_reader   :decryption_keys
 
   def initialize(data:, secure_key_prefix:, decryption_keys: {}, **_args)
-    self.decryption_keys  = decryption_keys || {}
-    self.data             = data.dup
+    self.decryption_keys  = (decryption_keys || {}).transform_keys(&:to_s)
+    self.data             = data.deep_dup
     self.secure_key_token = /\A#{Regexp.escape(secure_key_prefix)}/
   end
 
@@ -46,7 +48,7 @@ class   DecryptionFilter
   protected
 
   def execute(raw_data = data)
-    settings = Hashie::Mash.new
+    settings = {}
 
     raw_data.each_pair do |key, value|
       settings[key] = if value.respond_to? :each_pair
@@ -75,21 +77,17 @@ class   DecryptionFilter
 
   private
 
-  # rubocop:disable Style/RedundantBegin
   def decrypt(key, value)
     method = decryption_method(value)
 
     decryption_keys.each do |decryption_key|
-      begin
-        return method.decrypt(key, value, decryption_key)
-      rescue OpenSSL::PKey::RSAError
-        next
-      end
+      return method.decrypt(key, value, decryption_key)
+    rescue OpenSSL::PKey::RSAError
+      next
     end
 
     value
   end
-  # rubocop:enable Style/RedundantBegin
 
   def decryption_method(value)
     if value.is_a?(::String)

data/lib/chamber/filters/encryption_filter.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
 require 'openssl'
-require 'hashie/mash'
 require 'yaml'
 require 'chamber/encryption_methods/public_key'
 require 'chamber/encryption_methods/ssl'
 require 'chamber/encryption_methods/none'
+require 'chamber/refinements/deep_dup'
 
 module    Chamber
 module    Filters
 class     EncryptionFilter
+  using ::Chamber::Refinements::DeepDup
+
   BASE64_STRING_PATTERN     = %r{\A[A-Za-z0-9+/]{342}==\z}.freeze
   BASE64_SUBSTRING_PATTERN  = %r{[A-Za-z0-9+/#]*={0,2}}.freeze
   LARGE_DATA_STRING_PATTERN = /
@@ -27,8 +29,8 @@ class     EncryptionFilter
   attr_reader   :encryption_keys
 
   def initialize(data:, secure_key_prefix:, encryption_keys: {}, **_args)
-    self.encryption_keys  = encryption_keys || {}
-    self.data             = data.dup
+    self.encryption_keys  = (encryption_keys || {}).transform_keys(&:to_s)
+    self.data             = data.deep_dup
     self.secure_key_token = /\A#{Regexp.escape(secure_key_prefix)}/
   end
 
@@ -39,7 +41,7 @@ class     EncryptionFilter
   protected
 
   def execute(raw_data = data, namespace = nil)
-    raw_data.each_with_object(Hashie::Mash.new) do |(key, value), settings|
+    raw_data.each_with_object({}) do |(key, value), settings|
       settings[key] = if value.respond_to? :each_pair
                         execute(value, namespace || key)
                       elsif key.match(secure_key_token)
@@ -51,7 +53,7 @@ class     EncryptionFilter
   end
 
   def encryption_keys=(other)
-    @encryption_keys = other.each_with_object({}) do |(namespace, keyish), memo|
+    @encryption_keys = other.each_with_object({}) do |(namespace, keyish), memo| # rubocop:disable Style/HashTransformValues
       memo[namespace] = if keyish.is_a?(OpenSSL::PKey::RSA)
                           keyish
                         elsif ::File.readable?(::File.expand_path(keyish))
@@ -67,7 +69,7 @@ class     EncryptionFilter
 
   def encrypt(namespace, key, value)
     method         = encryption_method(value)
-    encryption_key = encryption_keys[namespace] || encryption_keys[:__default]
+    encryption_key = encryption_keys[namespace] || encryption_keys['__default']
 
     return value unless encryption_key
 

data/lib/chamber/filters/environment_filter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'yaml'
-require 'hashie/mash'
 
 require 'chamber/errors/environment_conversion'
 
@@ -122,7 +121,7 @@ class   EnvironmentFilter
   private
 
   def with_environment(settings, parent_keys, hash_block, value_block)
-    environment_hash = Hashie::Mash.new
+    environment_hash = {}
 
     settings.each_pair do |key, value|
       environment_key  = key.to_s.gsub(secure_key_token, '')
@@ -170,13 +169,13 @@ class   EnvironmentFilter
       environment_value
     end
   rescue ArgumentError
-    raise Chamber::Errors::EnvironmentConversion, <<-HEREDOC
-We attempted to convert '#{environment_key}' from '#{environment_value}' to a '#{settings_value.class.name}'.
+    raise Chamber::Errors::EnvironmentConversion, <<~HEREDOC
+      We attempted to convert '#{environment_key}' from '#{environment_value}' to a '#{settings_value.class.name}'.
 
-Unfortunately, this did not go as planned.  Please either verify that your value is convertable
-or change the original YAML value to be something more generic (like a String).
+      Unfortunately, this did not go as planned.  Please either verify that your value is convertable
+      or change the original YAML value to be something more generic (like a String).
 
-For more information, see https://github.com/thekompanee/chamber/wiki/Environment-Variable-Coercions
+      For more information, see https://github.com/thekompanee/chamber/wiki/Environment-Variable-Coercions
     HEREDOC
   end
 end

data/lib/chamber/filters/failed_decryption_filter.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 require 'chamber/errors/decryption_failure'
+require 'chamber/refinements/deep_dup'
 
 module  Chamber
 module  Filters
 class   FailedDecryptionFilter
+  using ::Chamber::Refinements::DeepDup
+
   BASE64_STRING_PATTERN = %r{\A[A-Za-z0-9+/]{342}==\z}.freeze
 
   def self.execute(**args)
@@ -15,7 +18,7 @@ class   FailedDecryptionFilter
                 :secure_key_token
 
   def initialize(data:, secure_key_prefix:, **_args)
-    self.data             = data.dup
+    self.data             = data.deep_dup
     self.secure_key_token = /\A#{Regexp.escape(secure_key_prefix)}/
   end
 

data/lib/chamber/filters/insecure_filter.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'hashie/mash'
 require 'chamber/filters/secure_filter'
 
 module  Chamber
@@ -22,7 +21,7 @@ class   InsecureFilter < SecureFilter
 
   def execute(raw_data = data) # rubocop:disable Metrics/CyclomaticComplexity
     securable_settings = super
-    settings           = Hashie::Mash.new
+    settings           = {}
 
     securable_settings.each_pair do |key, value|
       value = if value.respond_to? :each_pair

data/lib/chamber/filters/namespace_filter.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
-require 'hashie/mash'
+require 'chamber/refinements/deep_dup'
+require 'chamber/refinements/hash'
 
 module  Chamber
 module  Filters
 class   NamespaceFilter
+  using ::Chamber::Refinements::DeepDup
+  using ::Chamber::Refinements::Hash
+
   def self.execute(**args)
     new(**args).__send__(:execute)
   end
@@ -13,26 +17,24 @@ class   NamespaceFilter
                 :namespaces
 
   def initialize(data:, namespaces:, **_args)
-    self.data       = Hashie::Mash.new(data)
+    self.data       = data.deep_dup
     self.namespaces = namespaces
   end
 
   protected
 
   def execute
-    if data_is_namespaced?
-      namespaces.each_with_object(Hashie::Mash.new) do |namespace, filtered_data|
-        filtered_data.merge!(data[namespace]) if data[namespace]
-      end
-    else
-      Hashie::Mash.new(data)
+    return data unless data_is_namespaced?
+
+    namespaces.each_with_object({}) do |namespace, filtered_data|
+      filtered_data.deep_merge!(data[namespace]) if data[namespace]
     end
   end
 
   private
 
   def data_is_namespaced?
-    @data_is_namespaced ||= data.keys.any? { |key| namespaces.include? key.to_s }
+    @data_is_namespaced ||= data.keys.any? { |key| namespaces.include?(key.to_s) }
   end
 end
 end

data/lib/chamber/filters/secure_filter.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
-require 'hashie/mash'
+require 'chamber/refinements/deep_dup'
 
 module  Chamber
 module  Filters
 class   SecureFilter
+  using ::Chamber::Refinements::DeepDup
+
   def self.execute(**args)
     new(**args).__send__(:execute)
   end
@@ -13,14 +15,14 @@ class   SecureFilter
                 :secure_key_token
 
   def initialize(data:, secure_key_prefix:, **_args)
-    self.data             = Hashie::Mash.new(data)
+    self.data             = data.deep_dup
     self.secure_key_token = /\A#{Regexp.escape(secure_key_prefix)}/
   end
 
   protected
 
   def execute(raw_data = data)
-    settings = Hashie::Mash.new
+    settings = {}
 
     raw_data.each_pair do |key, value|
       secure_value  = if value.respond_to? :each_pair

data/lib/chamber/filters/translate_secure_keys_filter.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
-require 'hashie/mash'
+require 'chamber/refinements/deep_dup'
 
 module  Chamber
 module  Filters
 class   TranslateSecureKeysFilter
+  using ::Chamber::Refinements::DeepDup
+
   def self.execute(**args)
     new(**args).__send__(:execute)
   end
@@ -13,14 +15,14 @@ class   TranslateSecureKeysFilter
                 :secure_key_token
 
   def initialize(data:, secure_key_prefix:, **_args)
-    self.data             = data.dup
+    self.data             = data.deep_dup
     self.secure_key_token = /\A#{Regexp.escape(secure_key_prefix)}/
   end
 
   protected
 
   def execute(raw_data = data)
-    settings = Hashie::Mash.new
+    settings = {}
 
     raw_data.each_pair do |key, value|
       value = execute(value) if value.respond_to? :each_pair

data/lib/chamber/instance.rb

@@ -92,15 +92,5 @@ class   Instance
       )
       .to_hash
   end
-
-  def method_missing(name, *args)
-    return settings.public_send(name, *args) if settings.respond_to?(name)
-
-    super
-  end
-
-  def respond_to_missing?(name, include_private = false)
-    settings.respond_to?(name, include_private)
-  end
 end
 end

data/lib/chamber/refinements/deep_dup.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Chamber
+module Refinements
+module DeepDup
+refine ::Array do
+  def deep_dup
+    map { |i| i.respond_to?(:deep_dup) ? i.deep_dup : i.dup }
+  end
+end
+
+refine ::Object do
+  def deep_dup
+    dup
+  end
+end
+
+refine ::Hash do
+  def deep_dup
+    dup.tap do |hash|
+      each_pair do |key, value|
+        if key.frozen? && key.is_a?(::String)
+          hash[key] = value.deep_dup
+        else
+          hash.delete(key)
+          hash[key.deep_dup] = value.deep_dup
+        end
+      end
+    end
+  end
+end
+end
+end
+end

data/lib/chamber/refinements/enumerable.rb

@@ -9,8 +9,7 @@ class  Enumerable
     case object
     when ::Hash
       object.each do |(key, value)|
-        # fail ::Chamber::Errors::NonConformingKey unless key == yield(key)
-        warn "WARNING: Non-String settings keys are deprecated and will be removed in Chamber 3.0. You attempted to access the '#{key}' setting.  See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#all-settings-keys-are-now-stored-as-strings for full details. Called from: '#{caller.to_a.first}'" unless key == yield(key) # rubocop:disable Layout/LineLength
+        fail ::Chamber::Errors::NonConformingKey unless key == yield(key)
 
         deep_validate_keys(value, &block)
       end

data/lib/chamber/refinements/hash.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Chamber
+module Refinements
+module Hash
+refine ::Hash do
+  def deep_merge(other_hash, &block)
+    dup.deep_merge!(other_hash, &block)
+  end
+
+  def deep_merge!(other_hash, &block)
+    merge!(other_hash) do |key, this_val, other_val|
+      if this_val.is_a?(::Hash) && other_val.is_a?(::Hash)
+        this_val.deep_merge(other_val, &block)
+      elsif block
+        yield(key, this_val, other_val)
+      else
+        other_val
+      end
+    end
+  end
+end
+end
+end
+end

data/lib/chamber/settings.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'hashie/mash'
 require 'chamber/namespace_set'
 require 'chamber/filters/namespace_filter'
 require 'chamber/filters/encryption_filter'
@@ -10,13 +9,18 @@ require 'chamber/filters/secure_filter'
 require 'chamber/filters/translate_secure_keys_filter'
 require 'chamber/filters/insecure_filter'
 require 'chamber/filters/failed_decryption_filter'
+require 'chamber/refinements/deep_dup'
 require 'chamber/refinements/enumerable'
+require 'chamber/refinements/hash'
 
 ###
 # Internal: Represents the base settings storage needed for Chamber.
 #
 module  Chamber
 class   Settings
+  using ::Chamber::Refinements::Hash
+  using ::Chamber::Refinements::DeepDup
+
   attr_accessor :decryption_keys,
                 :encryption_keys,
                 :post_filters,
@@ -45,12 +49,12 @@ class   Settings
 
     ::Chamber::Refinements::Enumerable.deep_validate_keys(settings, &:to_s)
 
-    self.decryption_keys   = decryption_keys
-    self.encryption_keys   = encryption_keys
-    self.namespaces        = namespaces
+    self.decryption_keys   = (decryption_keys || {}).transform_keys(&:to_s)
+    self.encryption_keys   = (encryption_keys || {}).transform_keys(&:to_s)
+    self.namespaces        = NamespaceSet.new(namespaces)
     self.post_filters      = post_filters
     self.pre_filters       = pre_filters
-    self.raw_data          = settings
+    self.raw_data          = settings.deep_dup
     self.secure_key_prefix = secure_key_prefix
   end
   # rubocop:enable Metrics/ParameterLists
@@ -113,7 +117,7 @@ class   Settings
   # Returns a Hash
   #
   def to_hash
-    data.to_hash
+    data.deep_dup
   end
 
   ###
@@ -205,7 +209,7 @@ class   Settings
       encryption_keys: encryption_keys.any? ? encryption_keys : other_settings.encryption_keys,
       decryption_keys: decryption_keys.any? ? decryption_keys : other_settings.decryption_keys,
       namespaces:      (namespaces + other_settings.namespaces),
-      settings:        raw_data.merge(other_settings.raw_data),
+      settings:        raw_data.deep_merge(other_settings.raw_data),
     )
     # rubocop:enable Layout/LineLength
   end
@@ -232,10 +236,9 @@ class   Settings
   end
 
   def [](key)
-    warn "WARNING: Bracket access will require strings instead of symbols in Chamber 3.0.  You attempted to access the '#{key}' setting.  See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#removal-of-bracket-indifferent-access for full details. Called from: '#{caller.to_a.first}'" if key.is_a?(::Symbol) # rubocop:disable Layout/LineLength
-    warn "WARNING: Accessing a non-existent key ('#{key}') with brackets will fail in Chamber 3.0.  See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#bracket-access-now-fails-on-non-existent-keys for full details. Called from: '#{caller.to_a.first}'" unless data.has_key?(key) # rubocop:disable Layout/LineLength
+    fail ::ArgumentError, 'Bracket access with anything other than a String is unsupported.' unless key.is_a?(::String)
 
-    data.[](key)
+    data.fetch(key)
   end
 
   def dig!(*args)
@@ -275,30 +278,10 @@ class   Settings
                  ))
   end
 
-  def method_missing(name, *args)
-    if data.respond_to?(name)
-      warn "WARNING: Object notation access is deprecated and will be removed in Chamber 3.0.  You attempted to access the '#{name}' setting.  See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#removal-of-object-notation-access for full details. Called from: '#{caller.to_a.first}'" # rubocop:disable Layout/LineLength
-      warn "WARNING: Predicate methods are deprecated and will be removed in Chamber 3.0.  You attempted to access the '#{name}' setting.  See https://github.com/thekompanee/chamber/wiki/Upgrading-To-Chamber-3.0#removal-of-predicate-accessors for full details. Called from: '#{caller.to_a.first}'" if name.to_s.end_with?('?') # rubocop:disable Layout/LineLength
-
-      data.public_send(name, *args)
-    else
-      super
-    end
-  end
-
-  def respond_to_missing?(name, include_private = false)
-    data.respond_to?(name, include_private)
-  end
-
   protected
 
-  def raw_data=(new_raw_data)
-    @raw_data   = Hashie::Mash.new(new_raw_data)
-  end
-
-  def namespaces=(raw_namespaces)
-    @namespaces = NamespaceSet.new(raw_namespaces)
-  end
+  attr_writer :namespaces,
+              :raw_data
 
   # rubocop:disable Naming/MemoizedInstanceVariableName
   def raw_data

data/lib/chamber/types/secured.rb

@@ -40,7 +40,7 @@ class   Secured < CHAMBER_TYPE_VALUE_SUPERCLASS
     when Hash
       value
     when String
-      ::ActiveSupport::JSON.decode(value)
+      ::JSON.parse(value)
     when NilClass
       nil
     else
@@ -63,10 +63,10 @@ class   Secured < CHAMBER_TYPE_VALUE_SUPERCLASS
   def serialize(value)
     fail ArgumentError, 'Any attributes encrypted with Chamber must be a Hash' unless value.is_a?(Hash)
 
-    ::ActiveSupport::JSON.encode(
-      Chamber.encrypt(value,
-                      decryption_keys: decryption_keys,
-                      encryption_keys: encryption_keys),
+    ::JSON.dump(
+      ::Chamber.encrypt(value,
+                        decryption_keys: decryption_keys,
+                        encryption_keys: encryption_keys),
     )
   end
   alias type_cast_for_database serialize

data/lib/chamber/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Chamber
-  VERSION = '2.14.3'
+  VERSION = '3.0.0rc2'
 end

data/lib/chamber.rb

@@ -11,10 +11,6 @@ module  Chamber
     self.instance = Instance.new(**args)
   end
 
-  def env
-    instance.settings
-  end
-
   def instance
     @instance ||= Instance.new
   end
@@ -81,29 +77,17 @@ module  Chamber
     instance.to_s(**args)
   end
 
-  def method_missing(name, *args)
-    return instance.public_send(name, *args) if instance.respond_to?(name)
-
-    super
-  end
-
-  def respond_to_missing?(name, include_private = false)
-    instance.respond_to?(name, include_private)
-  end
-
   module_function :[],
                   :configuration,
                   :decrypt,
                   :dig!,
                   :dig,
                   :encrypt,
-                  :env,
                   :filenames,
                   :files,
                   :instance,
                   :instance=,
                   :load,
-                  :method_missing,
                   :namespaces,
                   :respond_to_missing?,
                   :secure,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chamber
 version: !ruby/object:Gem::Version
-  version: 2.14.3
+  version: 3.0.0rc2
 platform: ruby
 authors:
 - thekompanee
@@ -38,7 +38,7 @@ cert_chain:
   ZjvLRaDI6IVoq0skZju//VZLiN6slVhAYYQj0uka/T0DZieabVYDcT4BVpa9M7Gz
   CDW/VDWjvEEbsCIW0oYhtUrkqE8GLIdrpLUjefOERbS5TslD7lG/MH5k
   -----END CERTIFICATE-----
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -60,20 +60,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -183,11 +169,11 @@ files:
 - lib/chamber/commands/verify.rb
 - lib/chamber/configuration.rb
 - lib/chamber/context_resolver.rb
-- lib/chamber/core_ext/hash.rb
 - lib/chamber/encryption_methods/none.rb
 - lib/chamber/encryption_methods/public_key.rb
 - lib/chamber/encryption_methods/ssl.rb
 - lib/chamber/errors/decryption_failure.rb
+- lib/chamber/errors/disallowed_class.rb
 - lib/chamber/errors/environment_conversion.rb
 - lib/chamber/errors/non_conforming_key.rb
 - lib/chamber/file.rb
@@ -210,7 +196,9 @@ files:
 - lib/chamber/keys/encryption.rb
 - lib/chamber/namespace_set.rb
 - lib/chamber/rails.rb
+- lib/chamber/refinements/deep_dup.rb
 - lib/chamber/refinements/enumerable.rb
+- lib/chamber/refinements/hash.rb
 - lib/chamber/rubinius_fix.rb
 - lib/chamber/settings.rb
 - lib/chamber/types/secured.rb
@@ -235,14 +223,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.7.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A surprisingly configurable convention-based approach to managing your application's

data/lib/chamber/core_ext/hash.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class Hash
-  def transform_keys
-    return enum_for(:transform_keys) { size } unless block_given?
-
-    result = {}
-
-    each_key do |key|
-      result[yield(key)] = self[key]
-    end
-
-    result
-  end
-end