chamber 2.14.3 → 3.0.0rc1

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/keys/base.rb

@@ -39,13 +39,13 @@ class   Base
                  namespaces.map { |n| namespace_to_key_path(n) }
   end
 
-  # rubocop:disable Performance/ChainArrayAllocation, Performance/MapCompact
+  # rubocop:disable Performance/ChainArrayAllocation
   def filenames=(other)
     @filenames = Array(other)
                    .map { |o| Pathname.new(o) }
                    .compact
   end
-  # rubocop:enable Performance/ChainArrayAllocation, Performance/MapCompact
+  # rubocop:enable Performance/ChainArrayAllocation
 
   def namespaces=(other)
     @namespaces = other + %w{signature}

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

@@ -1,25 +1,36 @@
 # frozen_string_literal: true
 
-require 'chamber/errors/non_conforming_key'
-
 module Chamber
 module Refinements
 class  Enumerable
-  def self.deep_validate_keys(object, &block)
+  def self.deep_transform_keys(object, &block)
     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
-
-        deep_validate_keys(value, &block)
+      object.each_with_object({}) do |(key, value), result|
+        result[yield(key)] = deep_transform_keys(value, &block)
       end
     when ::Array
-      object.map { |v| deep_validate_keys(v, &block) }
+      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/rubinius_fix.rb

@@ -5,7 +5,7 @@ require 'pathname'
 unless Pathname.instance_methods.include?(:write)
   class Pathname
     def write(*args)
-      IO.write @path, *args # rubocop:disable Security/IoMethods
+      IO.write @path, *args
     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,19 +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/enumerable'
+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(
@@ -42,15 +46,12 @@ class   Settings
                   settings:          {},
                   **_args
                 )
-
-    ::Chamber::Refinements::Enumerable.deep_validate_keys(settings, &:to_s)
-
     self.decryption_keys   = decryption_keys
     self.encryption_keys   = encryption_keys
     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
@@ -113,7 +114,7 @@ class   Settings
   # Returns a Hash
   #
   def to_hash
-    data.to_hash
+    data.dup
   end
 
   ###
@@ -146,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
@@ -196,7 +197,7 @@ class   Settings
     other_settings = case other
                      when Settings
                        other
-                     when Hash
+                     when ::Hash
                        Settings.new(settings: other)
                      end
 
@@ -205,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
@@ -232,10 +233,10 @@ 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
+    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)
@@ -253,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],
@@ -268,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. 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
@@ -303,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.3'
+  VERSION = '3.0.0rc1'
 end

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.tar.gz.sig

@@ -1 +1,4 @@
-~Hߊ�{��BZ�׷����9�B{l�Jg��b�3�BmP��ᩚwֺ`c4}�zߓ����&?�"���4��5I*�M֔o�G�w̩�����%����p��0���T��uK�[�<ZԿ�j9��_n��I�4O��[W��c{3�/�>{i�(DZN�p���+BB:�.c&P%���o
+`�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