wisepdf 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/wisepdf/render.rb

@@ -11,8 +11,6 @@ module Wisepdf
     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
@@ -22,71 +20,63 @@ module Wisepdf
     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
-
-      def log_pdf_creation
-        logger.info '*'*15 + 'PDF' + '*'*15
-      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
+  protected
+    def log_pdf_creation
+      logger.info '*'*15 + 'PDF' + '*'*15
+    end
 
-      def clean_temp_files
-        if defined?(@hf_tempfiles)
-          @hf_tempfiles.each { |tf| tf.close! }
-        end
+    def clean_temp_files
+      if defined?(@hf_tempfiles)
+        @hf_tempfiles.each { |tf| tf.close! }
       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_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 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]
-        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
 
-      # 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
+    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
-        options
       end
+      arguments
+    end
   end
 end

data/lib/wisepdf/writer.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 module Wisepdf
   class Writer        
     def initialize(path=nil)
@@ -11,12 +13,31 @@ module Wisepdf
       invoke = self.command.join(' ')   
       log(invoke) if Wisepdf::Configuration.development? || Wisepdf::Configuration.test?
 
-      result = IO.popen(invoke, "wb+") do |pdf|
-        pdf.sync = true
-        pdf.puts(string)
-        pdf.close_write
-        pdf.gets(nil)
+      # result = IO.popen(invoke, "wb+") do |f|
+      #   # f.sync = true
+      #   f.puts(string)
+      #   f.close_write
+      #   f.gets(nil)
+      #   
+      #   # pdf = f.gets(nil)
+      #   # f.close
+      #   # pdf        
+      # end
+      result, err = Open3.popen3(invoke) do |stdin, stdout, stderr|
+        stdin.write(string)
+        stdin.close
+        [stdout.read, stderr.read]
       end
+      # result, err = Open3.popen3(invoke) do |stdin, stdout, stderr|
+      #   stdin.binmode
+      #   stdout.binmode
+      #   stderr.binmode
+      #   stdin.write(string)
+      #   stdin.close_write
+      #   
+      #   [stdout.read, stderr.read]
+      # end
+      
 
       raise Wisepdf::WriteError if result.to_s.strip.empty?
 

data/wisepdf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wisepdf"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Alexandrov"]
-  s.date = "2012-04-26"
+  s.date = "2012-04-27"
   s.description = "wisepdf uses the shell utility wkhtmltopdf to serve a PDF file to a user from HTML. In other words, rather than dealing with a PDF generation DSL of some sort, you simply write an HTML view as you would normally, and let pdf take care of the hard stuff."
   s.email = "igor.alexandrov@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wisepdf
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70283634711100 !ruby/object:Gem::Requirement
+  requirement: &70342391986920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70283634711100
+  version_requirements: *70342391986920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70283634710280 !ruby/object:Gem::Requirement
+  requirement: &70342391985400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283634710280
+  version_requirements: *70342391985400
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
-  requirement: &70283634709500 !ruby/object:Gem::Requirement
+  requirement: &70342391984480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283634709500
+  version_requirements: *70342391984480
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70283634708780 !ruby/object:Gem::Requirement
+  requirement: &70342391983740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283634708780
+  version_requirements: *70342391983740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70283634707900 !ruby/object:Gem::Requirement
+  requirement: &70342391982400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70283634707900
+  version_requirements: *70342391982400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70283634706880 !ruby/object:Gem::Requirement
+  requirement: &70342391981320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70283634706880
+  version_requirements: *70342391981320
 description: wisepdf uses the shell utility wkhtmltopdf to serve a PDF file to a user
   from HTML. In other words, rather than dealing with a PDF generation DSL of some
   sort, you simply write an HTML view as you would normally, and let pdf take care
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -892500023114510086
+      hash: 3612362875393278572
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: