ghtml2pdf 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f6922a9478fbccfc04fb8f995314d4916b8a09d
-  data.tar.gz: bd10e27b1cf116ec4d90894109870efe4218c2df
+  metadata.gz: cdfdbe8ab1a2b00b5cf66b27b99be41beb18303f
+  data.tar.gz: 7bd1589a4c06e5fb32955d50ec3d95901438e58d
 SHA512:
-  metadata.gz: 235563288c6b44762ce66943749165a5a452e730dee5ff121f7ab437baac070c090c416d106a6117d639547d5d84a6ce9a55da0284806b163c6f049f2dee9b2a
-  data.tar.gz: 4a2177d0c82a7f6aea373a692375acc719b5bc37a99b526138d184c86fcf25157b55c1360e5e32f1259aac58f96ff403391d3e7be9ee0784b87c0ba6e60b30b1
+  metadata.gz: 2844420dbfd5e88d9929c2b5f9abe3ce98add53ec90ba0f551d4a78a0b992f6632c3caad62ddc79b4f7fef9318636f2197ca03d7e59ca3c2660b2e3acc3ae311
+  data.tar.gz: 300d570641270b7975b195a5ff7c6e63088a04536f16300f8891d9bc873584b5442d93a7d839ebe88b89377f59435cd533089691849f432b0963fa017c085c08

data/Changelog.md

@@ -1,5 +1,10 @@
 # Change log
 
+## 0.2.0 / 2016-02-06
+
+* Set wider margins by default
+* Allow setting all margins from the command line
+
 ## 0.1.1 / 2016-02-06
 
 * Run headlessly using xvfb

data/lib/ghtml2pdf/application.rb

@@ -1,18 +1,14 @@
 require 'gir_ffi-gtk3'
 require_relative 'argument_parser'
 
-GirFFI.setup :WebKit2, '4.0'
+GirFFI.setup :WebKit2
 
 module GHtml2Pdf
   # Main GHtml2Pdf application. Orchestrates the Gtk+ objects needed to load
   # and print a web page to PDF.
   class Application
-    attr_reader :input, :output
-
     def initialize(argv)
-      argument_parser = ArgumentParser.new(argv)
-      @input = argument_parser.input
-      @output = argument_parser.output
+      @argument_parser = ArgumentParser.new(argv)
     end
 
     def run
@@ -34,6 +30,24 @@ module GHtml2Pdf
 
     private
 
+    attr_reader :argument_parser
+
+    def top_margin
+      @top_margin ||= argument_parser.top_margin || Unit.new('2cm')
+    end
+
+    def bottom_margin
+      @bottom_margin ||= argument_parser.bottom_margin || Unit.new('3cm')
+    end
+
+    def left_margin
+      @left_margin ||= argument_parser.left_margin || Unit.new('2cm')
+    end
+
+    def right_margin
+      @right_margin ||= argument_parser.right_margin || Unit.new('2cm')
+    end
+
     def print_operation
       WebKit2::PrintOperation.new(web_view).tap do |operation|
         operation.page_setup = page_setup
@@ -44,11 +58,15 @@ module GHtml2Pdf
     def 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
       end
     end
 
     def web_context
-      @web_context || WebKit2::WebContext.new.tap do |context|
+      @web_context ||= WebKit2::WebContext.new.tap do |context|
         context.set_process_model :multiple_secondary_processes
       end
     end
@@ -73,11 +91,11 @@ module GHtml2Pdf
     end
 
     def output_uri
-      "file://#{File.expand_path(output)}"
+      "file://#{File.expand_path(argument_parser.output)}"
     end
 
     def input_uri
-      "file://#{File.expand_path(input)}"
+      "file://#{File.expand_path(argument_parser.input)}"
     end
   end
 end

data/lib/ghtml2pdf/argument_parser.rb

@@ -1,3 +1,6 @@
+require 'optparse'
+require 'ruby-units'
+
 module GHtml2Pdf
   # Error class raised for missing arguments
   class MissingArgument < StandardError; end
@@ -5,11 +8,46 @@ module GHtml2Pdf
   # Parses the command line arguments
   class ArgumentParser
     attr_reader :input, :output
+    attr_reader :top_margin, :bottom_margin, :left_margin, :right_margin
 
     def initialize(argv)
+      option_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
+    end
+
+    private
+
+    def top_margin=(val)
+      @top_margin = Unit.new(val)
+    end
+
+    def bottom_margin=(val)
+      @bottom_margin = Unit.new(val)
+    end
+
+    def left_margin=(val)
+      @left_margin = Unit.new(val)
+    end
+
+    def right_margin=(val)
+      @right_margin = Unit.new(val)
+    end
   end
 end

data/lib/ghtml2pdf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghtml2pdf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi-gtk
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: headless
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: ruby-units
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.4.0
 description: "\n    Clean Ruby implemenentation of a HTML to PDF\n    converter based
   on WebKit, WebKit2GTK+ and GirFFI\n  "
 email: