ghtml2pdf 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cdfdbe8ab1a2b00b5cf66b27b99be41beb18303f
-  data.tar.gz: 7bd1589a4c06e5fb32955d50ec3d95901438e58d
+SHA256:
+  metadata.gz: 123b03968a78ec83823e0938eb1a749bc16561bc9a2e59252bd828b92a97b260
+  data.tar.gz: 7d9bddb02ff8616deb9d6ac3861b5aab946e1fadab146dda3a5322a6bdbbcb5e
 SHA512:
-  metadata.gz: 2844420dbfd5e88d9929c2b5f9abe3ce98add53ec90ba0f551d4a78a0b992f6632c3caad62ddc79b4f7fef9318636f2197ca03d7e59ca3c2660b2e3acc3ae311
-  data.tar.gz: 300d570641270b7975b195a5ff7c6e63088a04536f16300f8891d9bc873584b5442d93a7d839ebe88b89377f59435cd533089691849f432b0963fa017c085c08
+  metadata.gz: 14fc0733668d042b41379f3fc9b1cf34aec2af3c0aa6a8d3efc7bdadcb1d02374c24f1fccbe8a43f1d29a5e3b67b2f1d933cc812efa0b4faba2377f76a3af17c
+  data.tar.gz: be73db65d725b3605375d26d41437aafc04da48e9e5415ff1747d12c47f76e0d748465d0fdf830c768dc8b5da1e5f945d91e4ae1f6028190f0881d1936b8e41b

data/Changelog.md

@@ -1,4 +1,9 @@
-# Change log
+# Changelog
+
+## 0.3.0 / 2017-03-25
+
+* Update dependency on GirFFI-Gtk
+* Target Ruby 2.3 and up
 
 ## 0.2.0 / 2016-02-06
 

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Matijs van Zuijlen
+Copyright (c) 2015-2018 Matijs van Zuijlen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/ghtml2pdf

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'ghtml2pdf'
 require 'headless'

data/lib/ghtml2pdf/application.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'gir_ffi-gtk3'
 require_relative 'argument_parser'
+require_relative 'print_settings'
 
 GirFFI.setup :WebKit2
 
@@ -9,9 +12,21 @@ module GHtml2Pdf
   class Application
     def initialize(argv)
       @argument_parser = ArgumentParser.new(argv)
+      default_web_context.set_process_model :multiple_secondary_processes
     end
 
     def run
+      setup_load_handler
+      load_uri
+      Gtk.main
+      destroy_view
+    end
+
+    private
+
+    attr_reader :argument_parser
+
+    def setup_load_handler
       web_view.signal_connect 'load-changed' do |_, event, _|
         case event
         when :finished
@@ -20,18 +35,16 @@ module GHtml2Pdf
           Gtk.main_quit
         end
       end
+    end
 
+    def load_uri
       web_view.load_uri(input_uri)
+    end
 
-      Gtk.main
-
+    def destroy_view
       web_view.destroy
     end
 
-    private
-
-    attr_reader :argument_parser
-
     def top_margin
       @top_margin ||= argument_parser.top_margin || Unit.new('2cm')
     end
@@ -56,38 +69,41 @@ module GHtml2Pdf
     end
 
     def page_setup
-      Gtk::PageSetup.new.tap do |setup|
+      @page_setup ||= Gtk::PageSetup.new.tap do |setup|
         setup.set_paper_size Gtk::PaperSize.new Gtk::PAPER_NAME_A4
-        setup.set_top_margin top_margin.convert_to('mm').scalar, :mm
-        setup.set_bottom_margin bottom_margin.convert_to('mm').scalar, :mm
-        setup.set_left_margin left_margin.convert_to('mm').scalar, :mm
-        setup.set_right_margin right_margin.convert_to('mm').scalar, :mm
+        setup.set_top_margin top_margin_in_mm, :mm
+        setup.set_bottom_margin bottom_margin_in_mm, :mm
+        setup.set_left_margin left_margin_in_mm, :mm
+        setup.set_right_margin right_margin_in_mm, :mm
       end
     end
 
-    def web_context
-      @web_context ||= WebKit2::WebContext.new.tap do |context|
-        context.set_process_model :multiple_secondary_processes
-      end
+    def top_margin_in_mm
+      top_margin.convert_to('mm').scalar
+    end
+
+    def bottom_margin_in_mm
+      bottom_margin.convert_to('mm').scalar
+    end
+
+    def left_margin_in_mm
+      left_margin.convert_to('mm').scalar
+    end
+
+    def right_margin_in_mm
+      right_margin.convert_to('mm').scalar
+    end
+
+    def default_web_context
+      @default_web_context ||= WebKit2::WebContext.get_default
     end
 
     def web_view
-      @web_view ||= WebKit2::WebView.new_with_context web_context
+      @web_view ||= WebKit2::WebView.new
     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
+      @print_settings ||= PrintSettings.new.tap { |it| it.output_uri = output_uri }
     end
 
     def output_uri

data/lib/ghtml2pdf/argument_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'optparse'
 require 'ruby-units'
 
@@ -11,28 +13,38 @@ module GHtml2Pdf
     attr_reader :top_margin, :bottom_margin, :left_margin, :right_margin
 
     def initialize(argv)
-      option_parser.parse! argv
+      setup_banner
+      setup_margin_options
+      setup_help_message
+      parser.parse! argv
       @input, @output, = argv
       raise MissingArgument, 'An input filename is required' unless @input
       raise MissingArgument, 'An output filename is required' unless @output
     end
 
-    def option_parser
-      @option_parser ||=
-        OptionParser.new.tap do |parser|
-          parser.banner = "Usage: #{parser.program_name} [options] INFILE OUTFILE"
-          parser.on('--top-margin MARGIN', 'Set top margin') { |val| self.top_margin = val }
-          parser.on('--bottom-margin MARGIN', 'Set bottom margin') { |val| self.bottom_margin = val }
-          parser.on('--left-margin MARGIN', 'Set left margin') { |val| self.left_margin = val }
-          parser.on('--right-margin MARGIN', 'Set right margin') { |val| self.right_margin = val }
-          parser.on_tail('-h', '--help', 'Show this message') do
-            puts parser
-            exit
-          end
-        end
+    private
+
+    def parser
+      @parser ||= OptionParser.new
     end
 
-    private
+    def setup_banner
+      parser.banner = "Usage: #{parser.program_name} [options] INFILE OUTFILE"
+    end
+
+    def setup_margin_options
+      parser.on('--top-margin MARGIN', 'Set top margin') { |val| self.top_margin = val }
+      parser.on('--bottom-margin MARGIN', 'Set bottom margin') { |val| self.bottom_margin = val }
+      parser.on('--left-margin MARGIN', 'Set left margin') { |val| self.left_margin = val }
+      parser.on('--right-margin MARGIN', 'Set right margin') { |val| self.right_margin = val }
+    end
+
+    def setup_help_message
+      parser.on_tail('-h', '--help', 'Show this message') do
+        puts parser
+        exit
+      end
+    end
 
     def top_margin=(val)
       @top_margin = Unit.new(val)

data/lib/ghtml2pdf/print_settings.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'gir_ffi-gtk3'
+
+module GHtml2Pdf
+  # Specialized PrintSettings class for printing to a file.
+  class PrintSettings < Gtk::PrintSettings
+    def initialize
+      super
+      set_number_up 1
+      set_reverse false
+      set_print_pages :all
+      set 'output-file-format', 'pdf'
+      set_collate false
+      set_n_copies 1
+      set_printer 'Print to File'
+      set_page_set :all
+      set_scale 100.0
+    end
+
+    def output_uri=(uri)
+      set 'output-uri', uri
+    end
+  end
+end

data/lib/ghtml2pdf/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GHtml2Pdf
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/ghtml2pdf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ghtml2pdf/version'
 require 'ghtml2pdf/application'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghtml2pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi-gtk
@@ -16,140 +16,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: headless
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: ruby-units
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: pdf-reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '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
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '3.3'
 description: "\n    Clean Ruby implemenentation of a HTML to PDF\n    converter based
   on WebKit, WebKit2GTK+ and GirFFI\n  "
 email:
@@ -166,6 +152,7 @@ files:
 - lib/ghtml2pdf.rb
 - lib/ghtml2pdf/application.rb
 - lib/ghtml2pdf/argument_parser.rb
+- lib/ghtml2pdf/print_settings.rb
 - lib/ghtml2pdf/version.rb
 homepage: https://github.com/mvz/ghtml2pdf
 licenses:
@@ -179,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -187,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: HTML to PDF converter based on WebKit2GTK+