rendering.rb in munge-0.12.0

- old
+ new

@@ -25,19 +25,15 @@
             capture(&block)
           end
 
         output =
           engines
-            .inject(content) do |memo, engine|
-              options  = @tilt_options[engine]
-              template = engine.new(template_name, options) { memo }
+            .reduce(content) do |memoized_content, engine|
+              options  = tilt_options[engine]
+              template = engine.new(template_name, options) { memoized_content }
 
-              if inner
-                template.render(self, data) { inner }
-              else
-                template.render(self, data)
-              end
+              template.render(self, data) { inner }
             end
 
         if block_given?
           append_to_erbout(block.binding, output)
         end
@@ -60,22 +56,19 @@
 
       private
 
       def merged_data(*data)
         hash_with_string_and_symbol_keys =
-          data.inject(@global_data) do |merged, datum|
+          data.reduce(system.global_data) do |merged, datum|
             merged.merge(datum)
           end
 
-        hash_with_string_and_symbol_keys
-          .each_with_object({}) do |(key, value), memo|
-            memo[key.to_sym] = value
-          end
+        Munge::Util::SymbolHash.deep_convert(hash_with_string_and_symbol_keys)
       end
 
       def resolve_layout(item_or_string)
         if item_or_string.is_a?(String)
-          @layouts[item_or_string]
+          system.layouts[item_or_string]
         else
           item_or_string
         end
       end
 