postdoc 0.3.5 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 374246c4708c1c0492a3c8117f6a891723ae66b3c57476d6370b63f414876eb9
-  data.tar.gz: 30cac5f1aeee47ea6fc52e8985edafbd72ad2b81082aa3e7887f21e787b198ee
+  metadata.gz: c8805f0d630a0bb6aacb1370839faec84c781d556c0f2f21a62f82cfb0127513
+  data.tar.gz: b0767fa2999a50cab5aa58204e4c43c16e38c0ee941c1389660c35cf6062fb15
 SHA512:
-  metadata.gz: 67093df126d95b92849611db7f08d1a6cbd065647398dfcdc8b31aaa68ab9f382b86de6edafb44cbca82a6ed95255e2817ce2bd842d3f9627380eed72d78f48a
-  data.tar.gz: 5b0ace904a20107d6d436c086bd20b183fe702c31b38e8bd4adab00c4f08bf34d28e07571129181fec6c28c98ea3f2cddf0312b841b75319692dd92db02831b4
+  metadata.gz: 9dbb3519424aef59b75c1951599be4a91e1b9fc722c5ef75e0dd9197cd58f8f455f0db5cc0e0bcfe9efb076c8797fc8fab48d6d745cd91a5b31bf7ea97c26769
+  data.tar.gz: 8c33f0a51a2127c1289095c6e43031e7fa988b410da1c94aa14d7caa1b33185398553000ef5e2ca4836a7cdcc77be5339aa9a71f2f70991f36228050df190870

data/lib/postdoc.rb

@@ -4,6 +4,8 @@ require 'action_controller'
 require 'postdoc/chrome_process'
 require 'postdoc/client'
 require 'postdoc/html_document'
+require 'postdoc/print_settings'
+require 'postdoc/batch'
 
 module Postdoc
   ActionController::Renderers.add :pdf do |_filename, options|
@@ -11,12 +13,42 @@ module Postdoc
   end
 
   def self.render_from_string(content, **options)
+    print_settings = PrintSettings.new(**options)
     server = ChromeProcess.new(**options)
-    html_file = HTMLDocument.new(content, **options)
+    html_file = HTMLDocument.new(content)
     server.client
-        .print_pdf_from_html(html_file.path, **options)
+        .print_pdf_from_html(html_file.path,
+            settings: print_settings)
   ensure
+    if server.client.client.present?
+      server.client.client.send_cmd 'Browser.close'
+    end
     server.kill
     html_file.cleanup
   end
+
+  # A clean and easy way to render a batch:
+  # ```
+  # html_string_1
+  # html_string_2
+  # with_footer = Postdoc::PrintSettings.new(footer_template: footer_template)
+
+  # result = Postdoc.batch do |batch|
+  #   batch.add_document doc1
+  #   batch.add_document doc2, settings: with_footer
+  # end
+  # ```
+  def self.batch(batch: Batch.new)
+    yield(batch)
+    begin
+      server = ChromeProcess.new
+      batch.result(server.client)
+    ensure
+      if server.client.client.present?
+        server.client.client.send_cmd 'Browser.close'
+      end
+      server.kill
+      batch.cleanup
+    end
+  end
 end

data/lib/postdoc/batch.rb

@@ -0,0 +1,34 @@
+require 'postdoc/print_settings'
+require 'postdoc/job'
+
+module Postdoc
+  # This module represents a batch. At times we want to render multiple PDF's in
+  # series and batching saves a lot of overhead by not restarting chrome over
+  # and over. Practical applications are  "stitching" PDF's together to get
+  # around markup constraints in chrome or rendering a batch of reports all at
+  # once.
+  class Batch
+    def initialize(jobs: [])
+      @jobs = jobs
+    end
+
+    # Creates a job from a document and add to the jobs.
+    def add_document(document, settings: {})
+      settings = PrintSettings.new(**settings)
+      @jobs << Job.new(document, settings: settings)
+    end
+
+    def add_job(job)
+      @jobs << job
+    end
+
+    # returns the output of the config. Requires a {Postdoc::Client Client}
+    def result(client)
+      @jobs.map { |job| job.result(client) }
+    end
+
+    def cleanup
+      @jobs.each(&:cleanup)
+    end
+  end
+end

data/lib/postdoc/chrome_process.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Postdoc
+  # Spins up a Chrome process.
   class ChromeProcess
     attr_reader :pid, :port
 
@@ -17,8 +18,10 @@ module Postdoc
     end
 
     def kill
-      Process.kill 'KILL', pid
+      Process.kill 'INT', pid
       Process.wait pid
+    rescue
+      true
     end
 
     def client

data/lib/postdoc/client.rb

@@ -3,6 +3,7 @@
 require 'chrome_remote'
 
 module Postdoc
+
   class Client
     attr_accessor :client
 
@@ -12,26 +13,25 @@ module Postdoc
       raise 'ChromeClient couldn\'t launch' if @client.blank?
     end
 
+    # We should move away from passing options like this and collect them in
+    # the prinbt settings.
     def print_pdf_from_html(file_path,
-        header_template: false,
-        footer_template: false,
-        **options)
+        settings: PrintSettings.new)
 
       client.send_cmd 'Page.enable'
       client.send_cmd 'Page.navigate', url: "file://#{file_path}"
       client.wait_for 'Page.loadEventFired'
 
-      response = client.send_cmd 'Page.printToPDF', {
-        landscape: options[:landscape] || false,
-        printBackground: true,
-        marginTop: options[:margin_top] || 1,
-        marginBottom: options[:margin_bottom] || 1,
-        marginLeft: options[:margin_left] || 1,
-        marginRight: options[:margin_right] || 1,
-        displayHeaderFooter: !!(header_template || footer_template),
-        headerTemplate: header_template || '',
-        footerTemplate: footer_template || ''
-      }
+      response = client.send_cmd 'Page.printToPDF', settings.to_cmd
+
+      Base64.decode64 response['data']
+    end
+
+    def print_document(file_path, settings: PrintSettings.new)
+      client.send_cmd 'Page.enable'
+      client.send_cmd 'Page.navigate', url: "file://#{file_path}"
+      client.wait_for 'Page.loadEventFired'
+      response = client.send_cmd 'Page.printToPDF', settings.to_cmd
 
       Base64.decode64 response['data']
     end
@@ -41,7 +41,7 @@ module Postdoc
     def setup_connection_or_wait
       @client = ChromeRemote.client(port: @port)
       true
-    rescue Errno::EHOSTUNREACH, Errno::ECONNREFUSED
+    rescue
       sleep(0.1)
       false
     end

data/lib/postdoc/html_document.rb

@@ -8,7 +8,7 @@ module Postdoc
 
     delegate :path, to: :file
 
-    def initialize(content, path: nil, **_options)
+    def initialize(content, path: nil)
       path ||= Rails.root&.join('tmp') || '/tmp'
       @file = Tempfile.new ['input', '.html'], path
 

data/lib/postdoc/job.rb

@@ -0,0 +1,18 @@
+module Postdoc
+  # A job is a single "print" in a batch and binds a document to a setting.
+  class Job
+    def initialize(document, settings: PrintSettings.new)
+      @settings = settings
+      @document = HTMLDocument.new(document)
+    end
+
+    # Return the result of the job.
+    def result(client)
+      client.print_document(@document.path, settings: @settings)
+    end
+
+    def cleanup
+      @document.cleanup
+    end
+  end
+end

data/lib/postdoc/print_settings.rb

@@ -0,0 +1,43 @@
+module Postdoc
+  # Different prints require different settings. This class is used instead of
+  # passing options arguments throughout all of the code.
+  class PrintSettings
+    def initialize(
+        header_template: '',
+        footer_template: '',
+        landscape: false,
+        print_background: true,
+        margin_top: 1,
+        margin_bottom: 1,
+        margin_left: 1,
+        margin_right: 1
+    )
+      @header_template = header_template
+      @footer_template = footer_template
+      @landscape = landscape
+      @print_background = print_background
+      @margin_top = margin_top
+      @margin_bottom = margin_bottom
+      @margin_left = margin_left
+      @margin_right = margin_right
+    end
+
+    def to_cmd
+      { landscape: @landscape,
+        printBackground: true,
+        marginTop: @margin_top,
+        marginBottom: @margin_bottom,
+        marginLeft: @margin_left,
+        marginRight: @margin_right,
+        displayHeaderFooter: display_header_and_footer?,
+        headerTemplate: @header_template,
+        footerTemplate: @footer_template }
+    end
+
+    private
+
+    def display_header_and_footer?
+      @header_template.present? || @footer_template.present?
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postdoc
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.9
 platform: ruby
 authors:
 - Frank Groeneveld
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chrome_remote
@@ -68,9 +68,12 @@ files:
 - LICENSE
 - Rakefile
 - lib/postdoc.rb
+- lib/postdoc/batch.rb
 - lib/postdoc/chrome_process.rb
 - lib/postdoc/client.rb
 - lib/postdoc/html_document.rb
+- lib/postdoc/job.rb
+- lib/postdoc/print_settings.rb
 homepage: https://github.com/ivaldi/postdoc
 licenses:
 - BSD-2-Clause