Merge pull request #29 from stitchfix/reduce-hashie-scope

Return a hash with indifferent access rather than a Mash

lib/setting.rb

@@ -8,6 +8,12 @@ class NotFound < RuntimeError; end
   class FileError < RuntimeError; end
   class AlreadyLoaded < RuntimeError; end
 
+  class SettingHash < Hash
+    include Hashie::Extensions::IndifferentAccess
+    include Hashie::Extensions::KeyConversion
+    include Hashie::Extensions::DeepMerge
+  end
+
   include Singleton
   NUM_KLASS = if RUBY_VERSION.split(/\./)[0].to_i == 2 && RUBY_VERSION.split(/\./)[1].to_i >= 4
                 Integer
@@ -87,7 +93,7 @@ def self.available_settings
   #=================================================================
 
   def initialize
-    @available_settings ||= Hashie::Mash.new
+    @available_settings ||= SettingHash.new
   end
 
   def has_key?(key)
@@ -105,6 +111,9 @@ def value_for(key, args = [])
     end
 
     v = @available_settings[name]
+    if v.is_a?(Hash)
+      v = SettingHash[v]
+    end
     if block_given?
       v = yield(v, args)
     end
@@ -151,7 +160,7 @@ def loaded?
 
   def load(params)
     # reset settings hash
-    @available_settings = Hashie::Mash.new
+    @available_settings = SettingHash.new
     @loaded = false
 
     files = []

spec/mc_settings_spec.rb

@@ -63,6 +63,7 @@
       expect(subject[:two][:three]).to eq(5)
       expect(subject['two'][:three]).to eq(5)
       expect(subject[:two]['three']).to eq(5)
+      expect(subject[:two].symbolize_keys[:three]).to eq(5)
     end
 
     context "working with arrays" do