lib/thousand_island/template.rb in thousand_island-0.0.1 vs lib/thousand_island/template.rb in thousand_island-0.1.0

@@ -179,17 +179,17 @@
     def body_height
       @body_height ||= body_start - footer_space
     end
 
     def header_space
-      return (pdf_options[:header][:height] + pdf_options[:header][:bottom_padding]) if pdf_options[:header][:render]
-      0
+      return 0 unless pdf_options[:header][:render]
+      pdf_options[:header][:height] + pdf_options[:header][:bottom_padding]
     end
 
     def footer_space
-      return (pdf_options[:footer][:height] + pdf_options[:footer][:top_padding]) if pdf_options[:footer][:render]
-      0
+      return 0 unless pdf_options[:footer][:render]
+      pdf_options[:footer][:height] + pdf_options[:footer][:top_padding]
     end
 
 
     def setup_prawn_document
       @pdf = Prawn::Document.new(pdf_options)
@@ -235,10 +235,10 @@
     end
 
 
 
     def deep_merger
-      @deep_merger ||= Utilities::DeepMerge
+      @deep_merger ||= Utilities::DeepMerge::TemplateOptions
     end
 
     # Called by method missing when a style is supplied with text, ie: h1 'Header'
     def render_with_style(style, output)
       style_values = send("#{style}_style")