ghtml2pdf 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 123b03968a78ec83823e0938eb1a749bc16561bc9a2e59252bd828b92a97b260
-  data.tar.gz: 7d9bddb02ff8616deb9d6ac3861b5aab946e1fadab146dda3a5322a6bdbbcb5e
+  metadata.gz: 6c5f3b9c7d46fcd011e28e5e0805b563b947effff5fa9d15543e22ca7b36b766
+  data.tar.gz: c4f4540b3a702fdc11f8d9570a258cdf82e1c4ace088619161318d04f392f9fe
 SHA512:
-  metadata.gz: 14fc0733668d042b41379f3fc9b1cf34aec2af3c0aa6a8d3efc7bdadcb1d02374c24f1fccbe8a43f1d29a5e3b67b2f1d933cc812efa0b4faba2377f76a3af17c
-  data.tar.gz: be73db65d725b3605375d26d41437aafc04da48e9e5415ff1747d12c47f76e0d748465d0fdf830c768dc8b5da1e5f945d91e4ae1f6028190f0881d1936b8e41b
+  metadata.gz: b056de7f7942d60b259206308fc3d2064a2f560904f62c1fd34a16511c3b1ad757b9f495fabbbc679abcabd05d8042dfd32143720417a97d4e3ca2d1b72ab1d5
+  data.tar.gz: 2d2829181b0b9d879ab9855d9934e03b81ce97f9bf797470e432ad5214293146dbafd087e1d0de7012817e148d76c0c330e3f20407646395079d0165d08b78c0

data/Changelog.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.5.0 / 2022-04-10
+
+* Set output file from input file if not provided
+* Abort if input and output file names are identical
+* Drop support for Ruby 2.5
+* Add support for Ruby 3.1
+
+## 0.4.0 / 2021-08-11
+
+* Target Ruby 2.5 and up
+* Update dependency on GirFFI-Gtk and GirFFI
+* Stop using Headless; This gem now needs an active graphical session to run
+
+## 0.3.1 / 2019-02-13
+
+* Update dependency on GirFFI-Gtk
+
 ## 0.3.0 / 2017-03-25
 
 * Update dependency on GirFFI-Gtk

data/README.md

@@ -44,12 +44,13 @@ Or install it yourself as:
 
     $ gem install ghtml2pdf
 
-You will also need to install the WebKit2GTK+, the Gtk+ bindings for WebKit2,
-and gobject-introspection.
+You will also need to install WebKit2GTK+, the Gtk+ bindings for WebKit2,
+and GObject Introspection. You should probably also install AT-Spi 2 to
+avoid some annoying warning messages.
 
 On Debian and Ubuntu, this can be accomplished by installing the packages
-`libgirepository1.0-dev`, `gobject-introspection` should be enough to get
-`rake test` working.
+`libgirepository-1.0-1`, `gir1.2-gtk-3.0`, `gir1.2-webkit2-3.0` or
+`gir1.2-webkit2-4.0`, and `at-spi2-core`. You may also need to install ...
 
 ## Usage
 

data/bin/ghtml2pdf

@@ -1,9 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'ghtml2pdf'
-require 'headless'
+require "ghtml2pdf"
 
-Headless.ly do
-  GHtml2Pdf.run(ARGV)
-end
+GHtml2Pdf.run(ARGV)

data/lib/ghtml2pdf/application.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'gir_ffi-gtk3'
-require_relative 'argument_parser'
-require_relative 'print_settings'
+require "gir_ffi-gtk3"
+require "ghtml2pdf/argument_parser"
+require "ghtml2pdf/print_settings"
 
 GirFFI.setup :WebKit2
 
@@ -16,7 +16,7 @@ module GHtml2Pdf
     end
 
     def run
-      setup_load_handler
+      setup_signal_handlers
       load_uri
       Gtk.main
       destroy_view
@@ -26,15 +26,17 @@ module GHtml2Pdf
 
     attr_reader :argument_parser
 
-    def setup_load_handler
-      web_view.signal_connect 'load-changed' do |_, event, _|
+    def setup_signal_handlers
+      web_view.signal_connect "load-changed" do |_, event, _|
         case event
         when :finished
           print_operation.print
-          sleep 2
-          Gtk.main_quit
         end
       end
+
+      print_operation.signal_connect "finished" do |*_args|
+        Gtk.main_quit
+      end
     end
 
     def load_uri
@@ -46,23 +48,23 @@ module GHtml2Pdf
     end
 
     def top_margin
-      @top_margin ||= argument_parser.top_margin || Unit.new('2cm')
+      @top_margin ||= argument_parser.top_margin || Unit.new("2cm")
     end
 
     def bottom_margin
-      @bottom_margin ||= argument_parser.bottom_margin || Unit.new('3cm')
+      @bottom_margin ||= argument_parser.bottom_margin || Unit.new("3cm")
     end
 
     def left_margin
-      @left_margin ||= argument_parser.left_margin || Unit.new('2cm')
+      @left_margin ||= argument_parser.left_margin || Unit.new("2cm")
     end
 
     def right_margin
-      @right_margin ||= argument_parser.right_margin || Unit.new('2cm')
+      @right_margin ||= argument_parser.right_margin || Unit.new("2cm")
     end
 
     def print_operation
-      WebKit2::PrintOperation.new(web_view).tap do |operation|
+      @print_operation ||= WebKit2::PrintOperation.new(web_view).tap do |operation|
         operation.page_setup = page_setup
         operation.print_settings = print_settings
       end
@@ -79,19 +81,19 @@ module GHtml2Pdf
     end
 
     def top_margin_in_mm
-      top_margin.convert_to('mm').scalar
+      top_margin.convert_to("mm").scalar
     end
 
     def bottom_margin_in_mm
-      bottom_margin.convert_to('mm').scalar
+      bottom_margin.convert_to("mm").scalar
     end
 
     def left_margin_in_mm
-      left_margin.convert_to('mm').scalar
+      left_margin.convert_to("mm").scalar
     end
 
     def right_margin_in_mm
-      right_margin.convert_to('mm').scalar
+      right_margin.convert_to("mm").scalar
     end
 
     def default_web_context

data/lib/ghtml2pdf/argument_parser.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
-require 'optparse'
-require 'ruby-units'
+require "optparse"
+require "ruby-units"
 
 module GHtml2Pdf
-  # Error class raised for missing arguments
-  class MissingArgument < StandardError; end
+  # Error class raised for argument errors
+  class ArgumentError < StandardError; end
 
   # Parses the command line arguments
   class ArgumentParser
-    attr_reader :input, :output
-    attr_reader :top_margin, :bottom_margin, :left_margin, :right_margin
+    attr_reader :input, :output, :top_margin, :bottom_margin, :left_margin, :right_margin
 
     def initialize(argv)
       setup_banner
@@ -18,8 +17,10 @@ module GHtml2Pdf
       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
+      raise ArgumentError, "An input filename is required" unless @input
+
+      @output ||= "#{File.basename(@input, ".*")}.pdf"
+      raise ArgumentError, "Input and output files cannot be the same" if @input == @output
     end
 
     private
@@ -33,14 +34,18 @@ module GHtml2Pdf
     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 }
+      parser.on("--top-margin MARGIN", "Set top margin") { |val| self.top_margin = val }
+      parser.on("--bottom-margin MARGIN", "Set bottom margin") do |val|
+        self.bottom_margin = val
+      end
+      parser.on("--left-margin MARGIN", "Set left margin") { |val| self.left_margin = val }
+      parser.on("--right-margin MARGIN", "Set right margin") do |val|
+        self.right_margin = val
+      end
     end
 
     def setup_help_message
-      parser.on_tail('-h', '--help', 'Show this message') do
+      parser.on_tail("-h", "--help", "Show this message") do
         puts parser
         exit
       end

data/lib/ghtml2pdf/print_settings.rb

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

data/lib/ghtml2pdf/version.rb

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

data/lib/ghtml2pdf.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'ghtml2pdf/version'
-require 'ghtml2pdf/application'
+require "ghtml2pdf/version"
+require "ghtml2pdf/application"
 
 # Main entry point for GHtml2Pdf.
 module GHtml2Pdf
@@ -11,7 +11,7 @@ module GHtml2Pdf
   def self.run(argv)
     Gtk.init
     GHtml2Pdf::Application.new(argv).run
-  rescue GHtml2Pdf::MissingArgument => e
+  rescue GHtml2Pdf::ArgumentError => e
     warn e.message
     exit 1
   end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ghtml2pdf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-25 00:00:00.000000000 Z
+date: 2022-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gir_ffi-gtk
+  name: gir_ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
-  name: headless
+  name: gir_ffi-gtk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: ruby-units
   requirement: !ruby/object:Gem::Requirement
@@ -58,70 +58,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: pdf-reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
-  name: pdf-reader
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rake-manifest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -136,8 +136,64 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-description: "\n    Clean Ruby implemenentation of a HTML to PDF\n    converter based
-  on WebKit, WebKit2GTK+ and GirFFI\n  "
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+description: Clean Ruby implemenentation of a HTML to PDF converter based on WebKit,
+  WebKit2GTK+ and GirFFI
 email:
 - matijs@matijs.net
 executables:
@@ -157,8 +213,12 @@ files:
 homepage: https://github.com/mvz/ghtml2pdf
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/mvz/ghtml2pdf
+  source_code_uri: https://github.com/mvz/ghtml2pdf
+  changelog_uri: https://github.com/mvz/ghtml2pdf/blob/master/Changelog.md
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,16 +226,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: HTML to PDF converter based on WebKit2GTK+
 test_files: []