chamber 2.14.2 → 3.0.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89e0b6151f3cafb916f399bd49b780f6df353ab41832012c48a2f5520a03df5d
-  data.tar.gz: 4e976be3b9be2b3b2e30185895a3c2d330daa3880298a65ead34e30ca5befd81
+  metadata.gz: 3119f8787d3c63913a0ab69a0114cbf6d43a154ad1703aef610a2b02720b0cbc
+  data.tar.gz: ed25f8e4a9f93045c94aba4776fa6a0296f9db9f1312e4a1dadeb35343eba140
 SHA512:
-  metadata.gz: aa7e4a481d465da58e4b99f06e868f0b97fd9242e429ad0a233f6b2763930696ab60eb43d276a8e26aa5a245734e1c5dcce7bb08c1b568ebec83bddb9cc7d6c9
-  data.tar.gz: 3f9bdb837c924886b72b685d01debdb5ffcb33d1fa1220cf6c243bfde6e3d2b76f1579b565095cf355af54ee43fef8a722ed871bd2a72f484283b2adefe4e5cc
+  metadata.gz: acc3d5daf9e6570ccf16e76b8433e8d0912cdd85f4858f6634ee37531aa6a1c53b47621afeb21c0b9524eea6f8af3a02b52872f843b28a3f94d3e20bfa582880
+  data.tar.gz: 39a117062b19f734066f11c405730e499cc0325e6b2e3fd208aa68a930645e28f6b88f4f98e43133e8b70457d82ac3860f426b1385611b0d4b924003f79f0490

data.tar.gz.sig

@@ -1 +1,4 @@
-�f�,z�$��^^S�-�4*Pk��kɵ/$�_���݄���Ӭ#�|O0G��-6��Mz����hd���4�a�/�L�
`�	�SY?PLd���t%%�i׉/W���#��B$����o�=]M/��b/ɬe��aiX'��M��0���`Ƹ5��3�c���ߦ�4��=�/-�L����uo+iR��މ�n8�a99=�A���Չ=f�9�J
+`�1�O���ϓ��G�o0�s9m_��v�	TB�Ą���DZc�c�[P!�ۨ�t�����J�N(O���!y����"�Ye(emg�`!��OV���V?i���ȟ�s��z��IV�
+M!=������e�(�iV�Tw���ƾ$U����Lu+l܃�5��ӗ�Yf�ޤ][�T��寲VI�CҞ�-�\�a�%�
+5W:bL��K���E8�J��.!Hk�p�)�ׁ�+�p�-�7@�q����R��d��m�
+R�\=���ݾ���ֳ��ھc

data/lib/chamber.rb

@@ -81,16 +81,6 @@ 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,
@@ -103,7 +93,6 @@ module  Chamber
                   :instance,
                   :instance=,
                   :load,
-                  :method_missing,
                   :namespaces,
                   :respond_to_missing?,
                   :secure,

data/lib/chamber/adapters/cloud/heroku.rb

@@ -27,11 +27,11 @@ class   Heroku
     request['Authorization'] = "Bearer #{api_token}"
     request['Accept']        = 'application/vnd.heroku+json; version=3'
     request['Content-Type']  = 'application/json'
-    request.body             = ::JSON.dump(Hash[name, value])
+    request.body             = ::JSON.dump(::Hash[name, value])
 
     response = ::JSON.parse(response(request).body)
 
-    fail NameError, response['message'] if response['message']
+    fail ::NameError, response['message'] if response['message']
 
     response
   end
@@ -44,7 +44,7 @@ class   Heroku
 
     response = ::JSON.parse(response(request).body)
 
-    fail NameError, response['message'] if response['message']
+    fail ::NameError, response['message'] if response['message']
 
     response
   end

data/lib/chamber/binary/circle_ci.rb

@@ -1,16 +1,17 @@
 # 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'
 require 'chamber/commands/cloud/compare'
+require 'chamber/refinements/hash'
 
 module  Chamber
 module  Binary
-class   CircleCi < Thor
-  include Thor::Actions
+class   CircleCi < ::Thor
+  include ::Thor::Actions
+  using ::Chamber::Refinements::Hash
 
   class_option :api_token,
                type:     :string,
@@ -49,7 +50,7 @@ class   CircleCi < Thor
 
   def clear
     Commands::Cloud::Clear.call(**options
-                                    .transform_keys(&:to_sym)
+                                    .deep_transform_keys(&:to_sym)
                                     .merge(shell: self, adapter: 'circle_ci'))
   end
 
@@ -81,7 +82,7 @@ class   CircleCi < Thor
 
   def push
     Commands::Cloud::Push.call(**options
-                                   .transform_keys(&:to_sym)
+                                   .deep_transform_keys(&:to_sym)
                                    .merge(shell: self, adapter: 'circle_ci'))
   end
 
@@ -96,7 +97,7 @@ class   CircleCi < Thor
 
   def pull
     Commands::Cloud::Pull.call(**options
-                                   .transform_keys(&:to_sym)
+                                   .deep_transform_keys(&:to_sym)
                                    .merge(shell: self, adapter: 'circle_ci'))
   end
 
@@ -114,7 +115,7 @@ class   CircleCi < Thor
 
   def compare
     Commands::Cloud::Compare.call(**options
-                                      .transform_keys(&:to_sym)
+                                      .deep_transform_keys(&:to_sym)
                                       .merge(shell: self, adapter: 'circle_ci'))
   end
 end

data/lib/chamber/binary/heroku.rb

@@ -1,16 +1,17 @@
 # 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'
 require 'chamber/commands/cloud/compare'
+require 'chamber/refinements/hash'
 
 module  Chamber
 module  Binary
-class   Heroku < Thor
-  include Thor::Actions
+class   Heroku < ::Thor
+  include ::Thor::Actions
+  using ::Chamber::Refinements::Hash
 
   class_option :app,
                type:     :string,
@@ -37,7 +38,7 @@ class   Heroku < Thor
 
   def clear
     Commands::Cloud::Clear.call(**options
-                                    .transform_keys(&:to_sym)
+                                    .deep_transform_keys(&:to_sym)
                                     .merge(shell: self, adapter: 'heroku'))
   end
 
@@ -69,7 +70,7 @@ class   Heroku < Thor
 
   def push
     Commands::Cloud::Push.call(**options
-                                   .transform_keys(&:to_sym)
+                                   .deep_transform_keys(&:to_sym)
                                    .merge(shell: self, adapter: 'heroku'))
   end
 
@@ -84,7 +85,7 @@ class   Heroku < Thor
 
   def pull
     Commands::Cloud::Pull.call(**options
-                                   .transform_keys(&:to_sym)
+                                   .deep_transform_keys(&:to_sym)
                                    .merge(shell: self, adapter: 'heroku'))
   end
 
@@ -102,7 +103,7 @@ class   Heroku < Thor
 
   def compare
     Commands::Cloud::Compare.call(**options
-                                      .transform_keys(&:to_sym)
+                                      .deep_transform_keys(&:to_sym)
                                       .merge(shell: self, adapter: 'heroku'))
   end
 end

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'
@@ -13,11 +12,13 @@ require 'chamber/commands/sign'
 require 'chamber/commands/verify'
 require 'chamber/commands/compare'
 require 'chamber/commands/initialize'
+require 'chamber/refinements/hash'
 
 module  Chamber
 module  Binary
-class   Runner < Thor
-  include Thor::Actions
+class   Runner < ::Thor
+  include ::Thor::Actions
+  using ::Chamber::Refinements::Hash
 
   source_root ::File.expand_path('../../../templates', __dir__)
 
@@ -93,7 +94,7 @@ class   Runner < Thor
                          'Useful for debugging.'
 
   def show
-    puts Commands::Show.call(**options.transform_keys(&:to_sym).merge(shell: self))
+    puts Commands::Show.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
   end
 
   ################################################################################
@@ -101,7 +102,7 @@ class   Runner < Thor
   desc 'files', 'Lists the settings files which are parsed with the given options'
 
   def files
-    puts Commands::Files.call(**options.transform_keys(&:to_sym).merge(shell: self))
+    puts Commands::Files.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
   end
 
   ################################################################################
@@ -131,7 +132,7 @@ class   Runner < Thor
                           'destination of the comparison'
 
   def compare
-    Commands::Compare.call(**options.transform_keys(&:to_sym).merge(shell: self))
+    Commands::Compare.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
   end
 
   ################################################################################
@@ -151,7 +152,7 @@ class   Runner < Thor
                          'what values would be encrypted'
 
   def secure
-    Commands::Secure.call(**options.transform_keys(&:to_sym).merge(shell: self))
+    Commands::Secure.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
   end
 
   ################################################################################
@@ -170,9 +171,9 @@ class   Runner < Thor
 
   def sign
     if options[:verify]
-      Commands::Verify.call(**options.transform_keys(&:to_sym).merge(shell: self))
+      Commands::Verify.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
     else
-      Commands::Sign.call(**options.transform_keys(&:to_sym).merge(shell: self))
+      Commands::Sign.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
     end
   end
 
@@ -186,7 +187,7 @@ class   Runner < Thor
                 default: false
 
   def init
-    Commands::Initialize.call(**options.transform_keys(&:to_sym).merge(shell: self))
+    Commands::Initialize.call(**options.deep_transform_keys(&:to_sym).merge(shell: self))
   end
 end
 end

data/lib/chamber/binary/travis.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'chamber/core_ext/hash'
 require 'chamber/commands/travis/secure'
+require 'chamber/refinements/hash'
 
 module  Chamber
 module  Binary
-class   Travis < Thor
+class   Travis < ::Thor
+  using ::Chamber::Refinements::Hash
+
   desc 'secure',
        'Uses your Travis CI public key to encrypt the settings you have ' \
        'chosen not to commit to the repo'
@@ -26,7 +28,9 @@ class   Travis < Thor
                          'which are marked as "_secure"'
 
   def secure
-    Commands::Travis::Secure.call(**options.transform_keys(&:to_sym).merge(shell: self))
+    Commands::Travis::Secure.call(**options
+                                    .deep_transform_keys(&:to_sym)
+                                    .merge(shell: self))
   end
 end
 end

data/lib/chamber/commands/securable.rb

@@ -2,15 +2,18 @@
 
 require 'shellwords'
 require 'chamber/instance'
+require 'chamber/refinements/hash'
 
 module  Chamber
 module  Commands
 module  Securable
+  using ::Chamber::Refinements::Hash
+
   def initialize(only_sensitive: nil, **args)
     super(**args)
 
     ignored_settings_options        = args
-                                        .merge(files: ignored_settings_filepaths)
+                                        .deep_merge(files: ignored_settings_filepaths)
                                         .reject { |k, _v| k == 'basepath' }
     self.ignored_settings_instance  = Chamber::Instance.new(**ignored_settings_options)
     self.current_settings_instance  = Chamber::Instance.new(**args)

data/lib/chamber/context_resolver.rb

@@ -41,7 +41,6 @@ class   ContextResolver
                                     options[:basepath] + 'settings*.yml',
                                     options[:basepath] + 'settings',
                                   ]
-
     options[:signature_name]    = options[:signature_name]
 
     options

data/lib/chamber/file.rb

@@ -4,6 +4,7 @@ require 'pathname'
 require 'yaml'
 require 'erb'
 require 'chamber/files/signature'
+require 'chamber/refinements/hash'
 
 ###
 # Internal: Represents a single file containing settings information in a given
@@ -11,6 +12,8 @@ require 'chamber/files/signature'
 #
 module  Chamber
 class   File < Pathname
+  using ::Chamber::Refinements::Hash
+
   attr_accessor :namespaces,
                 :decryption_keys,
                 :encryption_keys,
@@ -143,7 +146,7 @@ class   File < Pathname
     file_contents = read
     erb_result    = ERB.new(file_contents).result
 
-    YAML.load(erb_result) || {}
+    (YAML.load(erb_result) || {}).deep_transform_keys(&:to_s)
   rescue Errno::ENOENT
     {}
   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
@@ -35,7 +37,7 @@ class   DecryptionFilter
 
   def initialize(data:, secure_key_prefix:, decryption_keys: {}, **_args)
     self.decryption_keys  = decryption_keys || {}
-    self.data             = data.dup
+    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,7 +77,6 @@ class   DecryptionFilter
 
   private
 
-  # rubocop:disable Style/RedundantBegin
   def decrypt(key, value)
     method = decryption_method(value)
 
@@ -89,7 +90,6 @@ class   DecryptionFilter
 
     value
   end
-  # rubocop:enable Style/RedundantBegin
 
   def decryption_method(value)
     if value.respond_to?(:match)

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 = /
@@ -28,7 +30,7 @@ class     EncryptionFilter
 
   def initialize(data:, secure_key_prefix:, encryption_keys: {}, **_args)
     self.encryption_keys  = encryption_keys || {}
-    self.data             = data.dup
+    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)
@@ -67,7 +69,8 @@ class     EncryptionFilter
 
   def encrypt(namespace, key, value)
     method         = encryption_method(value)
-    encryption_key = encryption_keys[namespace] || encryption_keys[:__default]
+    namespace_key  = namespace ? namespace.to_sym : nil
+    encryption_key = encryption_keys[namespace_key] || encryption_keys[:__default]
 
     return value unless encryption_key
 

data/lib/chamber/filters/environment_filter.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
 require 'yaml'
-require 'hashie/mash'
-
 require 'chamber/errors/environment_conversion'
+require 'chamber/refinements/hash'
+require 'chamber/refinements/deep_dup'
 
 module  Chamber
 module  Filters
 class   EnvironmentFilter
+  using ::Chamber::Refinements::Hash
+  using ::Chamber::Refinements::DeepDup
+
   ###
   # Internal: Allows the existing environment to be injected into the passed in
   # hash.  The hash that is passed in is *not* modified, instead a new hash is
@@ -120,18 +123,18 @@ 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, '')
-      environment_keys = parent_keys.dup.push(environment_key)
+      environment_keys = parent_keys.deep_dup.push(environment_key)
 
       if value.respond_to? :each_pair
-        environment_hash.merge!(hash_block.call(key, value, environment_keys))
+        environment_hash.deep_merge!(hash_block.call(key, value, environment_keys))
       else
         environment_key = environment_keys.join('_').upcase
 
-        environment_hash.merge!(value_block.call(key, value, environment_key))
+        environment_hash.deep_merge!(value_block.call(key, value, environment_key))
       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/hash'
+require 'chamber/refinements/deep_dup'
 
 module  Chamber
 module  Filters
 class   NamespaceFilter
+  using ::Chamber::Refinements::Hash
+  using ::Chamber::Refinements::DeepDup
+
   def self.execute(**args)
     new(**args).__send__(:execute)
   end
@@ -13,7 +17,7 @@ class   NamespaceFilter
                 :namespaces
 
   def initialize(data:, namespaces:, **_args)
-    self.data       = Hashie::Mash.new(data)
+    self.data       = data.deep_dup
     self.namespaces = namespaces
   end
 
@@ -21,11 +25,11 @@ class   NamespaceFilter
 
   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]
+      namespaces.each_with_object({}) do |namespace, filtered_data|
+        filtered_data.deep_merge!(data[namespace]) if data[namespace]
       end
     else
-      Hashie::Mash.new(data)
+      data
     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

@@ -3,9 +3,12 @@
 require 'chamber/configuration'
 require 'chamber/file_set'
 require 'chamber/settings'
+require 'chamber/refinements/hash'
 
 module  Chamber
 class   Instance
+  using ::Chamber::Refinements::Hash
+
   attr_accessor :configuration,
                 :files
 
@@ -63,11 +66,11 @@ class   Instance
   end
 
   def encrypt(data, **args)
-    config = configuration.to_hash.merge(**args)
+    config = configuration.to_hash.deep_merge(**args)
 
     Settings
       .new(
-        **config.merge(
+        **config.deep_merge(
           settings:     data,
           pre_filters:  [Filters::EncryptionFilter],
           post_filters: [],
@@ -77,11 +80,11 @@ class   Instance
   end
 
   def decrypt(data, **args)
-    config = configuration.to_hash.merge(**args)
+    config = configuration.to_hash.deep_merge(**args)
 
     Settings
       .new(
-        **config.merge(
+        **config.deep_merge(
           settings:     data,
           pre_filters:  [Filters::NamespaceFilter],
           post_filters: [
@@ -92,15 +95,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/array.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'rspectacular'
+require 'chamber/refinements/enumerable'
+
+module Chamber
+module Refinements
+module Array
+refine ::Array do
+  def deep_transform_keys(&block)
+    Refinements::Enumerable.deep_transform_keys(self, &block)
+  end
+
+  def deep_transform_values(&block)
+    Refinements::Enumerable.deep_transform_values(nil, self, &block)
+  end
+end
+end
+end
+end

data/lib/chamber/refinements/deep_dup.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Chamber
+module Refinements
+module DeepDup
+refine ::Array do
+  unless method_defined?(:deep_dup)
+    def deep_dup
+      map do |i|
+        if i.respond_to?(:deep_dup)
+          i.deep_dup
+        else
+          begin
+            i.dup
+          rescue ::TypeError
+            # Hack for < Ruby 2.4 since FalseClass, TrueClass, Fixnum, etc can't be
+            # dupped
+            i
+          end
+        end
+      end
+    end
+  end
+end
+
+refine ::Object do
+  unless method_defined?(:deep_dup)
+    def deep_dup
+      begin
+        dup
+      rescue ::TypeError
+        # Hack for < Ruby 2.4 since FalseClass, TrueClass, Fixnum, etc can't be
+        # dupped
+        self
+      end
+    end
+  end
+end
+
+refine ::Hash do
+  unless method_defined?(:deep_dup)
+    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
+end

data/lib/chamber/refinements/enumerable.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Chamber
+module Refinements
+class  Enumerable
+  def self.deep_transform_keys(object, &block)
+    case object
+    when ::Hash
+      object.each_with_object({}) do |(key, value), result|
+        result[yield(key)] = deep_transform_keys(value, &block)
+      end
+    when ::Array
+      object.map { |e| deep_transform_keys(e, &block) }
+    else
+      object
+    end
+  end
+
+  def self.deep_transform_values(key, value, &block)
+    case value
+    when ::Hash
+      value.each_with_object({}) do |(k, v), memo|
+        memo[k] = deep_transform_values(k, v, &block)
+      end
+    when ::Array
+      yield(
+        key,
+        value.map { |v| deep_transform_values(nil, v, &block) }
+      )
+    else
+      yield(key, value)
+    end
+  end
+end
+end
+end

data/lib/chamber/refinements/hash.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'rspectacular'
+require 'chamber/refinements/hash'
+require 'chamber/refinements/enumerable'
+
+module Chamber
+module Refinements
+module Hash
+refine ::Hash do
+  def deep_strip!
+    each do |key, value|
+      if value.respond_to?(:strip)
+        self[key] = value.strip
+      elsif value.respond_to?(:deep_strip!)
+        self[key] = value.deep_strip!
+      end
+    end
+  end
+
+  def deep_transform_keys(&block)
+    Refinements::Enumerable.deep_transform_keys(self, &block)
+  end
+
+  def deep_transform_values(&block)
+    Refinements::Enumerable.deep_transform_values(nil, self, &block)
+  end
+
+  unless method_defined?(:deep_merge)
+    def deep_merge(other, &block)
+      dup.deep_merge!(other, &block)
+    end
+  end
+
+  unless method_defined?(:deep_merge!)
+    def deep_merge!(other, &block)
+      merge!(other) do |key, value_1, value_2|
+        if value_1.is_a?(::Hash) && value_2.is_a?(::Hash)
+          value_1.deep_merge(value_2, &block)
+        elsif block
+          yield(key, value_1, value_2)
+        else
+          value_2
+        end
+      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,18 +9,24 @@ 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/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,
                 :pre_filters,
                 :secure_key_prefix
   attr_reader   :namespaces
+  attr_writer   :raw_data
 
   # rubocop:disable Metrics/ParameterLists
   def initialize(
@@ -46,7 +51,7 @@ class   Settings
     self.namespaces        = 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
@@ -109,7 +114,7 @@ class   Settings
   # Returns a Hash
   #
   def to_hash
-    data.to_hash
+    data.dup
   end
 
   ###
@@ -142,11 +147,11 @@ class   Settings
     flattened_name_hash = {}
 
     hash.each_pair do |key, value|
-      flattened_name_components = parent_keys.dup.push(key)
+      flattened_name_components = parent_keys.deep_dup.push(key)
 
       if value.respond_to?(:each_pair)
-        flattened_name_hash.merge! to_flattened_name_hash(value,
-                                                          flattened_name_components)
+        flattened_name_hash
+          .deep_merge!(to_flattened_name_hash(value, flattened_name_components))
       else
         flattened_name_hash[flattened_name_components] = value
       end
@@ -192,7 +197,7 @@ class   Settings
     other_settings = case other
                      when Settings
                        other
-                     when Hash
+                     when ::Hash
                        Settings.new(settings: other)
                      end
 
@@ -201,7 +206,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
@@ -231,7 +236,7 @@ class   Settings
     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." 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." unless data.has_key?(key) # rubocop:disable Layout/LineLength
 
-    data.[](key)
+    data.fetch(key)
   end
 
   def dig!(*args)
@@ -249,14 +254,14 @@ class   Settings
   end
 
   def securable
-    Settings.new(**metadata.merge(
+    Settings.new(**metadata.deep_merge(
                    settings:    raw_data,
                    pre_filters: [Filters::SecureFilter],
                  ))
   end
 
   def secure
-    Settings.new(**metadata.merge(
+    Settings.new(**metadata.deep_merge(
                    settings:     raw_data,
                    pre_filters:  [Filters::EncryptionFilter],
                    post_filters: [Filters::TranslateSecureKeysFilter],
@@ -264,34 +269,15 @@ class   Settings
   end
 
   def insecure
-    Settings.new(**metadata.merge(
+    Settings.new(**metadata.deep_merge(
                    settings:     raw_data,
                    pre_filters:  [Filters::InsecureFilter],
                    post_filters: [Filters::TranslateSecureKeysFilter],
                  ))
   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." # 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." 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
@@ -299,15 +285,16 @@ class   Settings
   # rubocop:disable Naming/MemoizedInstanceVariableName
   def raw_data
     @filtered_raw_data ||= pre_filters.inject(@raw_data) do |filtered_data, filter|
-      filter.execute(**{ data: filtered_data }.merge(metadata))
+      filter.execute(**{ data: filtered_data }.deep_merge(metadata))
     end
   end
   # rubocop:enable Naming/MemoizedInstanceVariableName
 
   def data
-    @data ||= post_filters.inject(raw_data) do |filtered_data, filter|
-      filter.execute(**{ data: filtered_data }.merge(metadata))
-    end
+    @data ||= post_filters
+                .inject(raw_data) do |filtered_data, filter|
+                  filter.execute(**{ data: filtered_data }.deep_merge(metadata))
+                end
   end
 
   def metadata

data/lib/chamber/types/secured.rb

@@ -37,14 +37,14 @@ class   Secured < CHAMBER_TYPE_VALUE_SUPERCLASS
 
   def cast(value)
     case value
-    when Hash
+    when ::Hash
       value
-    when String
-      ::ActiveSupport::JSON.decode(value)
-    when NilClass
+    when ::String
+      ::JSON.parse(value)
+    when ::NilClass
       nil
     else
-      fail ArgumentError, 'Any attributes encrypted with Chamber must be either a Hash or a valid JSON string'
+      fail ::ArgumentError, 'Any attributes encrypted with Chamber must be either a Hash or a valid JSON string'
     end
   end
   alias type_cast_from_user cast
@@ -54,19 +54,19 @@ class   Secured < CHAMBER_TYPE_VALUE_SUPERCLASS
 
     return if value.nil?
 
-    Chamber.decrypt(value,
-                    decryption_keys: decryption_keys,
-                    encryption_keys: encryption_keys)
+    ::Chamber.decrypt(value,
+                      decryption_keys: decryption_keys,
+                      encryption_keys: encryption_keys)
   end
   alias type_cast_from_database deserialize
 
   def serialize(value)
-    fail ArgumentError, 'Any attributes encrypted with Chamber must be a Hash' unless value.is_a?(Hash)
+    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.2'
+  VERSION = '3.0.0rc1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chamber
 version: !ruby/object:Gem::Version
-  version: 2.14.2
+  version: 3.0.0rc1
 platform: ruby
 authors:
 - thekompanee
@@ -58,20 +58,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
@@ -181,7 +167,6 @@ 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
@@ -207,6 +192,10 @@ files:
 - lib/chamber/keys/encryption.rb
 - lib/chamber/namespace_set.rb
 - lib/chamber/rails.rb
+- lib/chamber/refinements/array.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
@@ -234,9 +223,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.3
 signing_key:

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