wunderbar 0.14.7 → 0.15.0

data/lib/wunderbar/builder.rb

@@ -107,6 +107,7 @@ module Wunderbar
     def initialize(args)
       @_scope = args.delete(:scope)
       @_builder = SpacedMarkup.new(args)
+      @_pdf = false
     end
 
     # forward to Wunderbar, XmlMarkup, or @_scope
@@ -148,6 +149,14 @@ module Wunderbar
       end
     end
 
+    def pdf=(value)
+      @_pdf = value
+    end
+
+    def pdf?
+      @_pdf
+    end
+
     # execute a system command, echoing stdin, stdout, and stderr
     def system(command, opts={})
       if command.respond_to? :join

data/lib/wunderbar/cgi-methods.rb

@@ -1,10 +1,10 @@
 require 'digest/md5'
 
 module Wunderbar
-  module CGI
+  class CGI
 
     # produce json
-    def self.json(scope, &block)
+    def json(scope, &block)
       headers = { 'type' => 'application/json', 'Cache-Control' => 'no-cache' }
       builder = JsonBuilder.new(scope)
       output = builder.encode(&block)
@@ -18,7 +18,7 @@ module Wunderbar
     end
 
     # produce text
-    def self.text(scope, &block)
+    def text(scope, &block)
       headers = {'type' => 'text/plain', 'charset' => 'UTF-8'}
       builder = TextBuilder.new(scope)
       output = builder.encode(&block)
@@ -31,7 +31,7 @@ module Wunderbar
     end
 
     # Conditionally provide output, based on ETAG
-    def self.out?(scope, headers, &block)
+    def out?(scope, headers, &block)
       content = block.call
       etag = Digest::MD5.hexdigest(content)
 
@@ -49,16 +49,53 @@ module Wunderbar
       Wunderbar.fatal exception.inspect
     end
 
+    def html2pdf(input=nil, &block)
+      require 'thread'
+      require 'open3'
+      require 'stringio'
+
+      display=":#{rand(999)+1}"
+      pid = fork do
+        # close open files
+        STDIN.reopen '/dev/null'
+        STDOUT.reopen '/dev/null', 'a'
+        STDERR.reopen STDOUT
+
+        Process.setsid
+        Wunderbar.error Process.exec("Xvfb #{display}")
+        Process.exit
+      end
+      Process.detach(pid)
+
+      ENV['DISPLAY']=display
+      input ||= block.call
+      output = StringIO.new
+
+      Open3.popen3('wkhtmltopdf - -') do |pin, pout, perr|
+        [
+          Thread.new { pin.write input; pin.close },
+          Thread.new { IO.copy_stream(pout, output) },
+          Thread.new { perr.readpartial(4096) until perr.eof? }
+        ].map(&:join)
+      end
+
+      output.string
+    ensure
+      Process.kill 'INT', pid rescue nil
+    end
+
     # produce html/xhtml
-    def self.html(scope, *args, &block)
+    def html(scope, *args, &block)
       headers = { 'type' => 'text/html', 'charset' => 'UTF-8' }
       headers['type'] = 'application/xhtml+xml' if @xhtml
 
       x = HtmlMarkup.new(scope)
 
       begin
-        if @xhtml
-          output = x.xhtml *args, &block
+        if @pdf
+          x._.pdf = true if @pdf
+          headers = { 'type' => 'application/pdf' }
+          output = html2pdf {x.html *args, &block}
         else
           output = x.html *args, &block
         end
@@ -80,23 +117,32 @@ module Wunderbar
     end
 
     def self.call(scope)
+      new.call(scope)
+    end
+
+    def call(scope)
       env = scope.env
-      accept      = env['HTTP_ACCEPT'].to_s
-      request_uri = env['REQUEST_URI'].to_s
+      accept    = env['HTTP_ACCEPT'].to_s
+      path_info = env['PATH_INFO'].to_s
 
       # implied request types
       xhr_json = Wunderbar::Options::XHR_JSON  || (accept =~ /json/)
       text = Wunderbar::Options::TEXT || 
         (accept =~ /plain/ and accept !~ /html/)
       @xhtml = (accept =~ /xhtml/ or accept == '')
-
-      # overrides via the uri query parameter
-      xhr_json ||= (request_uri =~ /\?json$/)
-      text     ||= (request_uri =~ /\?text$/)
+      @pdf   = (accept =~ /pdf/)
 
       # overrides via the command line
       xhtml_override = ARGV.include?('--xhtml')
       html_override  = ARGV.include?('--html')
+      @pdf           ||= ARGV.include?('--pdf')
+
+      # overrides via the uri query parameter
+      xhr_json       ||= (path_info.end_with? '.json')
+      text           ||= (path_info.end_with? '.text')
+      @pdf           ||= (path_info.end_with? '.pdf')
+      xhtml_override ||= (path_info.end_with? '.xhtml')
+      html_override  ||= (path_info.end_with? '.html')
 
       # disable conneg if only one handler is provided
       if Wunderbar.queue.length == 1

data/lib/wunderbar/html-methods.rb

@@ -16,12 +16,6 @@ module Wunderbar
     def initialize(scope)
       @_scope = scope
       @x = XmlMarkup.new :scope => scope, :indent => 2, :target => []
-      @xthml = false
-    end
-
-    def xhtml(*args, &block)
-      @xhtml = true
-      html(*args, &block)
     end
 
     def html(*args, &block)
@@ -50,15 +44,6 @@ module Wunderbar
       html(*args, &block)
     end
 
-    def _xhtml(*args, &block)
-      @xhtml = true
-      html(*args, &block)
-    end
-
-    def xhtml?
-      @xhtml
-    end
-
     def method_missing(name, *args, &block)
       if name.to_s =~ /^_(\w+)(!|\?|)$/
         name, flag = $1, $2

data/lib/wunderbar/version.rb

@@ -1,8 +1,8 @@
 module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 14
-    TINY  = 7
+    MINOR = 15
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.14.7"
+  s.version = "0.15.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-05-11"
+  s.date = "2012-05-13"
   s.description = "    Wunderbar makes it easy to produce valid HTML5, wellformed XHTML, Unicode\n    (utf-8), consistently indented, readable applications.  This includes\n    output that conforms to the Polyglot specification and the emerging\n    results from the XML Error Recovery Community Group.\n"
   s.email = "rubys@intertwingly.net"
   s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar.rb", "lib/wunderbar", "lib/wunderbar/installation.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/server.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/websocket.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/version.rb"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wunderbar
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 35
   prerelease: 
   segments: 
   - 0
-  - 14
-  - 7
-  version: 0.14.7
+  - 15
+  - 0
+  version: 0.15.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-11 00:00:00 Z
+date: 2012-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder