ghtml2pdf 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2cd71696162ba34bf3dee787d03df42e83fc9d2
-  data.tar.gz: b3b8de83e5736ecd62535bf3cc5ea617c2921dcd
+  metadata.gz: 2f6922a9478fbccfc04fb8f995314d4916b8a09d
+  data.tar.gz: bd10e27b1cf116ec4d90894109870efe4218c2df
 SHA512:
-  metadata.gz: c63311016143803e16a3635681d8fe5289174d3cd948f110c07338a8cbfbccceebb8032b99cb811d858463f3e789b390875b9769644763c28b9784e1e50159c5
-  data.tar.gz: 4f5f163a322ffb2af9d8ecf825dcc0b746ef46b0a22fc24d23e483ad09945e71e9f3760ee5b958c4b3bc8ec39d338c09b4a3b6efc76979156f713a5b84c44f63
+  metadata.gz: 235563288c6b44762ce66943749165a5a452e730dee5ff121f7ab437baac070c090c416d106a6117d639547d5d84a6ce9a55da0284806b163c6f049f2dee9b2a
+  data.tar.gz: 4a2177d0c82a7f6aea373a692375acc719b5bc37a99b526138d184c86fcf25157b55c1360e5e32f1259aac58f96ff403391d3e7be9ee0784b87c0ba6e60b30b1

data/Changelog.md

@@ -1,5 +1,11 @@
 # Change log
 
+## 0.1.1 / 2016-02-06
+
+* Run headlessly using xvfb
+* Set A4 paper size explicitely
+* Update dependency on GirFFI-Gtk
+
 ## 0.1.0 / 2015-11-26
 
 * Initial release.

data/bin/ghtml2pdf

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'ghtml2pdf'
+require 'headless'
 
-GHtml2Pdf.run
+Headless.ly do
+  GHtml2Pdf.run(ARGV)
+end

data/lib/ghtml2pdf.rb

@@ -1,8 +1,16 @@
 require 'ghtml2pdf/version'
 require 'ghtml2pdf/application'
 
+# Main entry point for GHtml2Pdf.
 module GHtml2Pdf
-  def self.run
-    GHtml2Pdf::Application.new.run
+  # Run the application.
+  #
+  # @param [Array] argv The command line arguments
+  def self.run(argv)
+    Gtk.init
+    GHtml2Pdf::Application.new(argv).run
+  rescue GHtml2Pdf::MissingArgument => e
+    warn e.message
+    exit 1
   end
 end

data/lib/ghtml2pdf/application.rb

@@ -1,47 +1,22 @@
 require 'gir_ffi-gtk3'
+require_relative 'argument_parser'
+
+GirFFI.setup :WebKit2, '4.0'
 
 module GHtml2Pdf
+  # Main GHtml2Pdf application. Orchestrates the Gtk+ objects needed to load
+  # and print a web page to PDF.
   class Application
-    def run
-      input, output, = ARGV
-      unless input
-        warn "An input filename is required"
-        exit 1
-      end
-      unless output
-        warn "An output filename is required"
-        exit 1
-      end
-      input_uri = "file://#{File.expand_path(input)}"
-      output_uri = "file://#{File.expand_path(output)}"
-
-      GirFFI.setup :WebKit2, '4.0'
-
-      Gtk.init
-
-      win = Gtk::OffscreenWindow.new
-      web_view = WebKit2::WebView.new
-      win.add(web_view)
-
-      page_setup = Gtk::PageSetup.new
+    attr_reader :input, :output
 
-      print_settings = Gtk::PrintSettings.new
-      print_settings.set_number_up 1
-      print_settings.set_reverse false
-      print_settings.set_print_pages :all
-      print_settings.set 'output-uri', output_uri
-      print_settings.set 'output-file-format', 'pdf'
-      print_settings.set_collate false
-      print_settings.set_n_copies 1
-      print_settings.set_printer 'Print to File'
-      print_settings.set_page_set :all
-      print_settings.set_scale 100.0
-
-      print_operation = WebKit2::PrintOperation.new(web_view)
-      print_operation.page_setup = page_setup
-      print_operation.print_settings = print_settings
+    def initialize(argv)
+      argument_parser = ArgumentParser.new(argv)
+      @input = argument_parser.input
+      @output = argument_parser.output
+    end
 
-      web_view.signal_connect "load-changed" do |_, event, _|
+    def run
+      web_view.signal_connect 'load-changed' do |_, event, _|
         case event
         when :finished
           print_operation.print
@@ -51,9 +26,58 @@ module GHtml2Pdf
       end
 
       web_view.load_uri(input_uri)
-      win.show_all
 
       Gtk.main
+
+      web_view.destroy
+    end
+
+    private
+
+    def print_operation
+      WebKit2::PrintOperation.new(web_view).tap do |operation|
+        operation.page_setup = page_setup
+        operation.print_settings = print_settings
+      end
+    end
+
+    def page_setup
+      Gtk::PageSetup.new.tap do |setup|
+        setup.set_paper_size Gtk::PaperSize.new Gtk::PAPER_NAME_A4
+      end
+    end
+
+    def web_context
+      @web_context || WebKit2::WebContext.new.tap do |context|
+        context.set_process_model :multiple_secondary_processes
+      end
+    end
+
+    def web_view
+      @web_view ||= WebKit2::WebView.new_with_context web_context
+    end
+
+    def print_settings
+      Gtk::PrintSettings.new.tap do |settings|
+        settings.set_number_up 1
+        settings.set_reverse false
+        settings.set_print_pages :all
+        settings.set 'output-uri', output_uri
+        settings.set 'output-file-format', 'pdf'
+        settings.set_collate false
+        settings.set_n_copies 1
+        settings.set_printer 'Print to File'
+        settings.set_page_set :all
+        settings.set_scale 100.0
+      end
+    end
+
+    def output_uri
+      "file://#{File.expand_path(output)}"
+    end
+
+    def input_uri
+      "file://#{File.expand_path(input)}"
     end
   end
 end

data/lib/ghtml2pdf/argument_parser.rb

@@ -0,0 +1,15 @@
+module GHtml2Pdf
+  # Error class raised for missing arguments
+  class MissingArgument < StandardError; end
+
+  # Parses the command line arguments
+  class ArgumentParser
+    attr_reader :input, :output
+
+    def initialize(argv)
+      @input, @output, = argv
+      raise MissingArgument, 'An input filename is required' unless @input
+      raise MissingArgument, 'An output filename is required' unless @output
+    end
+  end
+end

data/lib/ghtml2pdf/version.rb

@@ -1,3 +1,3 @@
 module GHtml2Pdf
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghtml2pdf
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi-gtk
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: headless
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pdf-reader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.3.3
 description: "\n    Clean Ruby implemenentation of a HTML to PDF\n    converter based
   on WebKit, WebKit2GTK+ and GirFFI\n  "
 email:
@@ -109,6 +151,7 @@ files:
 - bin/ghtml2pdf
 - lib/ghtml2pdf.rb
 - lib/ghtml2pdf/application.rb
+- lib/ghtml2pdf/argument_parser.rb
 - lib/ghtml2pdf/version.rb
 homepage: https://github.com/mvz/ghtml2pdf
 licenses:
@@ -130,9 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: HTML to PDF converter based on WebKit2GTK+
 test_files: []
-has_rdoc: