lib/wisepdf/render.rb in wisepdf-1.1.1 vs lib/wisepdf/render.rb in wisepdf-1.1.2

@@ -9,84 +9,74 @@
     end
 
     def render(options = nil, *args, &block)
       if options.is_a?(Hash) && options.has_key?(:pdf)
         log_pdf_creation
-        options[:basic_auth] = set_basic_auth(options)
-        
         make_and_send_pdf(options.delete(:pdf), Wisepdf::Configuration.options.merge(options))
       else
         super
       end
     end
 
     def render_to_string(options = nil, *args, &block)
       if options.is_a?(Hash) && options.has_key?(:pdf)
         log_pdf_creation
-        options[:basic_auth] = set_basic_auth(options)
-        options.delete :pdf
+        options.delete(:pdf)
         make_pdf(Wisepdf::Configuration.options.merge(options))
       else
         super
       end
     end
 
-    private
+  protected
+    def log_pdf_creation
+      logger.info '*'*15 + 'PDF' + '*'*15
+    end
 
-      def log_pdf_creation
-        logger.info '*'*15 + 'PDF' + '*'*15
+    def clean_temp_files
+      if defined?(@hf_tempfiles)
+        @hf_tempfiles.each { |tf| tf.close! }
       end
+    end
 
-      def set_basic_auth(options={})
-        options[:basic_auth] ||= Wisepdf::Configuration.options.fetch(:basic_auth){ false }
-        if options[:basic_auth] && request.env["HTTP_AUTHORIZATION"]
-          request.env["HTTP_AUTHORIZATION"].split(" ").last
-        end
-      end
+    def make_pdf(options = {})
+      html_string = render_to_string(:template => options.delete(:template), :layout => options.delete(:layout))
+      options = prerender_header_and_footer(options)
+      w = Wisepdf::Writer.new(options[:wkhtmltopdf])
+      w.to_pdf(html_string, options)
+    end
 
-      def clean_temp_files
-        if defined?(@hf_tempfiles)
-          @hf_tempfiles.each { |tf| tf.close! }
-        end
+    def make_and_send_pdf(pdf_name, options={})
+      options[:wkhtmltopdf] ||= nil
+      options[:layout]      ||= false
+      options[:template]    ||= File.join(controller_path, action_name)
+      options[:disposition] ||= "inline"
+      if options[:show_as_html]
+        render :template => options[:template], :layout => options[:layout], :content_type => "text/html"
+      else
+        pdf_content = make_pdf(options)
+        File.open(options[:save_to_file], 'wb') {|file| file << pdf_content } if options.delete(:save_to_file)
+      
+        pdf_name += '.pdf' unless pdf_name =~ /.pdf\z|.PDF\Z/
+        send_data(pdf_content, :filename => pdf_name, :type => 'application/pdf', :disposition => options[:disposition]) unless options[:save_only]
       end
+    end
 
-      def make_pdf(options = {})
-        html_string = render_to_string(:template => options[:template], :layout => options[:layout])
-        options = prerender_header_and_footer(options)
-        w = Wisepdf::Writer.new(options[:wkhtmltopdf])
-        w.to_pdf(html_string, options)
-      end
-
-      def make_and_send_pdf(pdf_name, options={})
-        options[:wkhtmltopdf] ||= nil
-        options[:layout]      ||= false
-        options[:template]    ||= File.join(controller_path, action_name)
-        options[:disposition] ||= "inline"
-        if options[:show_as_html]
-          render :template => options[:template], :layout => options[:layout], :content_type => "text/html"
-        else
-          pdf_content = make_pdf(options)
-          File.open(options[:save_to_file], 'wb') {|file| file << pdf_content } if options[:save_to_file]
-        
-          pdf_name += '.pdf' unless pdf_name =~ /.pdf\z|.PDF\Z/
-          send_data(pdf_content, :filename => pdf_name, :type => 'application/pdf', :disposition => options[:disposition]) unless options[:save_only]
+    def prerender_header_and_footer(arguments)
+      [:header, :footer].each do |hf|
+        if arguments[hf] && arguments[hf][:html] && arguments[hf][:html].is_a?(Hash)
+          opts = arguments[hf].delete(:html)
+          
+          @hf_tempfiles = [] if ! defined?(@hf_tempfiles)
+          @hf_tempfiles.push( tf = Wisepdf::Tempfile.new("wisepdf_#{hf}_pdf.html") )
+          opts[:layout] ||= arguments[:layout]
+          
+          tf.write render_to_string(:template => opts[:template], :layout => opts[:layout], :locals => opts[:locals])
+          tf.flush
+          
+          options[hf][:html] = "file://#{tf.path}"                        
         end
       end
-
-      # Given an options hash, prerenders content for the header and footer sections
-      # to temp files and return a new options hash including the URLs to these files.
-      def prerender_header_and_footer(options)
-        [:header, :footer].each do |hf|
-          if options[hf] && options[hf][:html] && options[hf][:html][:template]
-            @hf_tempfiles = [] if ! defined?(@hf_tempfiles)
-            @hf_tempfiles.push( tf = Wisepdf::Tempfile.new("wicked_#{hf}_pdf.html") )
-            options[hf][:html][:layout] ||=  options[:layout]
-            tf.write render_to_string(:template => options[hf][:html][:template], :layout => options[hf][:html][:layout], :locals => options[hf][:html][:locals])
-            tf.flush
-            options[hf][:html].delete(:template)
-            options[hf][:html][:url] = "file://#{tf.path}"
-          end
-        end
-        options
-      end
+      arguments
+    end
   end
 end
\ No newline at end of file