Blacklight::OpenStructWithHashAccess should expose a HashWithIndifferentAccess

lib/blacklight/utils.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 require 'ostruct'
+require 'active_support/hash_with_indifferent_access'
+
 module Blacklight
   module Utils
     def self.needs_attr_accessible?
@@ -11,11 +13,31 @@ def self.protected_attributes_enabled?
     end
   end
 
+  class HashWithIndifferentAccessWithSymbolKeys < ActiveSupport::HashWithIndifferentAccess
+    protected
+
+    def convert_key(key)
+      if key.is_a?(Symbol)
+        key
+      elsif key.respond_to? :to_sym
+        key.to_sym
+      else
+        key
+      end
+    end
+  end
+
   ##
   # An OpenStruct that responds to common Hash methods
   class OpenStructWithHashAccess < OpenStruct
     delegate :keys, :each, :map, :has_key?, :key?, :include?, :empty?, :length, :delete, :delete_if, :keep_if, :clear, :reject!, :select!, :replace, :fetch, :to_json, :as_json, to: :to_h
 
+    def initialize(*args)
+      super
+
+      @table = HashWithIndifferentAccessWithSymbolKeys.new(@table)
+    end
+
     ##
     # Expose the internal hash
     # @return [Hash]

spec/lib/blacklight/utils_spec.rb

@@ -38,14 +38,13 @@
       end
 
       it "exposes the internal hash table" do
-        expect(@h.to_h).to be_a_kind_of(Hash)
+        expect(@h.to_h).to be_a_kind_of(HashWithIndifferentAccess)
         expect(@h.to_h[:a]).to eq 1
       end
 
       it "exposes keys" do
         expect(@h.keys).to include(:a, :b)
       end
-
     end
 
     describe "#key?" do