Added support for wkhtmltopdf, fixed gem dependency issues.

History.txt

@@ -1,13 +1,13 @@
-== 1.2.6, 1.2.7
+== 1.2.6, 1.2.7 2013-08-16
 
 * Major changes
   * Support for multiple domains (site alias) for a single site.
+  * Added support for wkhtmltopdf (Thanks Jean-Baptiste).
 
 * Minor changes
   * Added 'cmd' option for pdf brick. <== TODO: Document
   * Added 'local_ips' option to bricks.yml (used when pdf engine cannot render non-public assets). <== TODO: Document
   * Fixed dependency on newer versions of rails.
-  * Fixed authlogic dependency problems.
 
 == 1.2.5 2013-07-15
 

bricks/pdf/lib/bricks/pdf.rb

@@ -3,8 +3,8 @@
 
   Examples:
 
-  Bricks::Pdf.engine = 'prince'
-  Bricks::Pdf.cmd    = '/usr/local/bin/prince'
+  Bricks::Pdf.engine = 'wkhtmltopdf'
+  Bricks::Pdf.cmd    = '/usr/local/bin/wkhtmltopdf'
 
   Bricks::Pdf.render_file "myfile.html"                            => STDOUT       (strings)
   Bricks::Pdf.render_file "myfile.html", "out.pdf"                 => out.pdf      (file)
@@ -41,7 +41,6 @@ def engine=(engine_name)
     def render(options)
       res = nil
 
-      # TODO: redirect error messages...
       IO.popen(command(options), 'w+') do |io|
 
         if data = options[:data]
@@ -117,4 +116,4 @@ def render_to_pdf(opts)
     module ZafuMethods
     end # ZafuMethods
   end # Pdf
-end # Bricks
+end # Bricks

bricks/pdf/lib/bricks/pdf/engine/wkhtmltopdf.rb

@@ -24,7 +24,7 @@ def command(opts)
           if file = opts[:output]
             cmd << file
           else
-            cmd << "-o -"
+            cmd << "-"
           end
 
           # FIXME: find a way to redirect errors on screen instead of main log.

config/bricks.yml

@@ -23,7 +23,8 @@ development:
       gem: 'uv'
   pdf:
     switch: ON
-    engine: prince
+    engine: wkhtmltopdf
+    cmd: /usr/local/bin/wkhtmltopdf
 
   math:
     switch: ON
@@ -74,7 +75,8 @@ production:
       gem: 'simple_xlsx'
   pdf:
     switch: ON
-    engine: prince
+    engine: wkhtmltopdf
+    cmd: /usr/local/bin/wkhtmltopdf
   math:
     switch: ON
     live:   ON

zena.gemspec

@@ -342,7 +342,7 @@ Gem::Specification.new do |s|
     "bricks/pdf/VERSION",
     "bricks/pdf/lib/bricks/pdf.rb",
     "bricks/pdf/lib/bricks/pdf/engine/prince.rb",
-    "bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb",
+    "bricks/pdf/lib/bricks/pdf/engine/wkhtmltopdf.rb",
     "bricks/pdf/lib/bricks/pdf/install.rb",
     "bricks/pdf/test/engines/test_prince.rb",
     "bricks/pdf/test/engines/test_xhtml2pdf.rb",
@@ -2479,84 +2479,84 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.9"])
+      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
+      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
       s.add_runtime_dependency(%q<open4>, [">= 0"])
       s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
-      s.add_runtime_dependency(%q<property>, ["= 2.3.3"])
-      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
+      s.add_runtime_dependency(%q<property>, ["= 2.3.3"])
+      s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
+      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
       s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
-      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
-      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
       s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
       s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
-      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
-      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
       s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.9"])
-      s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
     else
+      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_dependency(%q<authlogic>, ["= 2.1.9"])
+      s.add_dependency(%q<json>, ["= 1.5.1"])
+      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_dependency(%q<tzinfo>, [">= 0"])
       s.add_dependency(%q<open4>, [">= 0"])
       s.add_dependency(%q<gettext>, ["= 2.1.0"])
-      s.add_dependency(%q<property>, ["= 2.3.3"])
-      s.add_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
       s.add_dependency(%q<daemons>, [">= 0"])
+      s.add_dependency(%q<property>, ["= 2.3.3"])
+      s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
+      s.add_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_dependency(%q<gem_plugin>, [">= 0"])
       s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
-      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
-      s.add_dependency(%q<tzinfo>, [">= 0"])
-      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_dependency(%q<syntax>, ["= 1.0.0"])
+      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
       s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
       s.add_dependency(%q<rubyless>, ["= 0.8.10"])
-      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_dependency(%q<versions>, ["= 0.3.1"])
-      s.add_dependency(%q<json>, ["= 1.5.1"])
       s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
       s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_dependency(%q<authlogic>, ["= 2.1.9"])
-      s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
     end
   else
+    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+    s.add_dependency(%q<authlogic>, ["= 2.1.9"])
+    s.add_dependency(%q<json>, ["= 1.5.1"])
+    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+    s.add_dependency(%q<tzinfo>, [">= 0"])
     s.add_dependency(%q<open4>, [">= 0"])
     s.add_dependency(%q<gettext>, ["= 2.1.0"])
-    s.add_dependency(%q<property>, ["= 2.3.3"])
-    s.add_dependency(%q<rails>, ["= 2.3.18"])
+    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
     s.add_dependency(%q<daemons>, [">= 0"])
+    s.add_dependency(%q<property>, ["= 2.3.3"])
+    s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
+    s.add_dependency(%q<versions>, ["= 0.3.1"])
+    s.add_dependency(%q<gem_plugin>, [">= 0"])
     s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
-    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
-    s.add_dependency(%q<tzinfo>, [">= 0"])
-    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-    s.add_dependency(%q<differ>, ["= 0.1.2"])
+    s.add_dependency(%q<syntax>, ["= 1.0.0"])
+    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
     s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
     s.add_dependency(%q<rubyless>, ["= 0.8.10"])
-    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-    s.add_dependency(%q<versions>, ["= 0.3.1"])
-    s.add_dependency(%q<json>, ["= 1.5.1"])
     s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
     s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<syntax>, ["= 1.0.0"])
-    s.add_dependency(%q<authlogic>, ["= 2.1.9"])
-    s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-    s.add_dependency(%q<gem_plugin>, [">= 0"])
-    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+    s.add_dependency(%q<rails>, ["= 2.3.18"])
+    s.add_dependency(%q<differ>, ["= 0.1.2"])
+    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
   end
 end