lib/facter/framework/formatters/formatter_helper.rb in facter-4.0.52 vs lib/facter/framework/formatters/formatter_helper.rb in facter-4.1.0

@@ -2,16 +2,15 @@
 
 module Facter
   class FormatterHelper
     class << self
       def retrieve_facts_to_display_for_user_query(user_queries, resolved_facts)
-        facts_to_display = {}
+        facts_to_display = FactCollection.new
         user_queries.each do |user_query|
           fact_collection = build_fact_collection_for_user_query(user_query, resolved_facts)
 
-          splitted_user_query = Utils.split_user_query(user_query)
-          printable_value = fact_collection.dig(*splitted_user_query)
+          printable_value = fact_collection.dig_fact(user_query)
           facts_to_display.merge!(user_query => printable_value)
         end
 
         Facter::Utils.sort_hash_by_key(facts_to_display)
       end
@@ -22,11 +21,10 @@
       end
 
       def retrieve_fact_value_for_single_query(user_query, resolved_facts)
         fact_collection = build_fact_collection_for_user_query(user_query, resolved_facts)
         fact_collection = Utils.sort_hash_by_key(fact_collection)
-        splitted_user_query = Utils.split_user_query(user_query)
-        fact_collection.dig(*splitted_user_query)
+        fact_collection.dig_fact(user_query)
       end
 
       private
 
       def build_fact_collection_for_user_query(user_query, resolved_facts)