invoice_printer 2.2.0.alpha1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73bc8cc15f44b26e3208614d83ee31dbb385b804e7a248723b07d6c9b60e7238
-  data.tar.gz: 5d2ab37a9051dba8ddd0018a4d7bc3d2f6a14949f131679f77ac7a0cd9069981
+  metadata.gz: 2f98cb9145f19c42e95490c56afbb156408c5049c766d9ddcb1c776ee112c5fe
+  data.tar.gz: 77c6280ab4566b41ad6b040113f3ccf99b0c4bf5e2bccce28c3d0740644a1e57
 SHA512:
-  metadata.gz: 3fb1d1f236410e510f79c30b9c817d63285ae9dd49a579ec4930e6596f1ab3c06d8d480c7e4c3f11f14873c14aa9d6b62bbd6e91687cafc052e6387244a791f3
-  data.tar.gz: 2819f38b58b55ec97517c5521cee21a70ab33ad64303d6c71f92ae41186f5c7136f66a88ef8aad9eaea0144c632cc96d71244cff04264a642f8f0cd13437b52a
+  metadata.gz: c1be305d2988483f0912598cbcd523b3f8f020667f61cb253e7b5c3f455ed188efebcec20fe4d1f77148ce984c9866c723c3e645a9e4515b50a67aceb85d45a5
+  data.tar.gz: f4764ce73b9c8f696cdd8bfa975ab1f3cbd8d85bb62a3b335a321eb7fb860b08a03835cc875c3dd774b670af3baeffc48f590e53d0c763ccece20e9e22b74657

data/Dockerfile

@@ -26,10 +26,10 @@ RUN apk update && apk upgrade
 RUN apk add build-base bash ruby ruby-etc ruby-dev
 
 # Install builtin fonts
-RUN gem install invoice_printer_fonts --version 2.1.0 --no-document
+RUN gem install invoice_printer_fonts --version 2.3.0 --no-document
 
 # Install the gem from RubyGems.org
-RUN gem install invoice_printer_server --version 2.1.0 --no-document
+RUN gem install invoice_printer_server --version 2.3.0 --no-document
 
 # Clean APK cache
 RUN rm -rf /var/cache/apk/*

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    invoice_printer (2.1.0.rc1)
+    invoice_printer (2.2.0)
+      e2mmap
       json (~> 2.1)
-      prawn (~> 2.2)
+      matrix
+      prawn (~> 2.4)
       prawn-table (~> 0.2.2)
-    invoice_printer_server (2.1.0.rc1)
-      invoice_printer (= 2.1.0.rc1)
+    invoice_printer_server (2.2.0)
+      invoice_printer (= 2.2.0)
       json (~> 2.1)
       puma (>= 3.9.0)
       roda (~> 3.5)
@@ -14,48 +16,52 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    Ascii85 (1.0.3)
+    Ascii85 (1.1.0)
     afm (0.2.2)
     benchmark_driver (0.15.17)
     benchmark_driver-output-gruff (0.3.1)
       benchmark_driver (>= 0.12.0)
       gruff
-    gruff (0.11.0)
+    e2mmap (0.1.0)
+    gruff (0.14.0)
       histogram
       rmagick
     hashery (2.1.2)
     histogram (0.2.4.1)
-    json (2.3.1)
-    minitest (5.14.2)
-    nio4r (2.5.4)
+    json (2.6.3)
+    matrix (0.1.0)
+    minitest (5.15.0)
+    nio4r (2.5.8)
     pdf-core (0.9.0)
     pdf-inspector (1.3.0)
       pdf-reader (>= 1.0, < 3.0.a)
-    pdf-reader (2.4.1)
-      Ascii85 (~> 1.0.0)
+    pdf-reader (2.11.0)
+      Ascii85 (~> 1.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
+    pkg-config (1.5.1)
     prawn (2.4.0)
       pdf-core (~> 0.9.0)
       ttfunk (~> 1.7)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
-    puma (5.0.2)
+    puma (6.0.2)
       nio4r (~> 2.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rake (13.0.1)
-    rmagick (4.1.2)
-    roda (3.36.0)
+    rack (3.0.4.1)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rake (13.0.6)
+    rmagick (5.1.0)
+      pkg-config (~> 1.4)
+    roda (3.64.0)
       rack
     ruby-rc4 (0.1.5)
     ttfunk (1.7.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   benchmark_driver (= 0.15.17)
@@ -68,4 +74,4 @@ DEPENDENCIES
   rake (>= 10.0)
 
 BUNDLED WITH
-   2.1.4
+   2.4.3

data/README.md

@@ -25,7 +25,7 @@ See more usecases in the `examples/` directory.
 - Purchaser and provider boxes with addresses and identificaton numbers
 - Payment method box showing banking details including SWIFT and IBAN fields
 - Issue/due dates box
-- Configurable items' table with item description, quantity, unit, price per unit, tax and item's total amount fields
+- Configurable items' table with item description, breakdown, quantity, unit, price per unit, tax and item's total amount fields
 - Final subtotal/tax/total info box
 - Page numbers
 - Configurable field labels & sublabels (optional little labels)

data/bin/invoice_printer

@@ -19,6 +19,7 @@ def show_help
       -d, --document   document as JSON
         -l, --labels   labels as JSON
               --font   path to font or builtin font name
+         --bold-font   path to bold font or builtin font name
          -s, --stamp   path to stamp
               --logo   path to logotype
         --background   path to background image
@@ -47,6 +48,10 @@ parser = OptionParser.new do|opts|
     options[:font] = path
   end
 
+  opts.on('--bold-font PATH') do |path|
+    options[:bold_font] = path
+  end
+
   opts.on('-s', '--stamp PATH') do |path|
     options[:stamp] = path
   end
@@ -116,6 +121,7 @@ begin
       document:   document,
       labels:     labels,
       font:       options[:font],
+      bold_font:  options[:bold_font],
       stamp:      options[:stamp],
       logo:       options[:logo],
       background: options[:background],
@@ -130,6 +136,7 @@ begin
       document:   document,
       labels:     labels,
       font:       options[:font],
+      bold_font:  options[:bold_font],
       stamp:      options[:stamp],
       logo:       options[:logo],
       file_name:  options[:filename],

data/docs/COMMAND_LINE.md

@@ -13,6 +13,7 @@ Options:
   -d, --document   document as JSON
     -l, --labels   labels as JSON
           --font   path to font or builtin font name
+     --bold-font   path to bold font or builtin font name
      -s, --stamp   path to stamp
           --logo   path to logotype
     --background   path to background image
@@ -48,6 +49,7 @@ JSON document with all possible fields filled:
   "bank_account_number":"156546546465",
   "account_iban":"IBAN464545645",
   "account_swift":"SWIFT5456",
+  "description": "We are invoicing the following items:",
   "items":[
     {
        "name":"Konzultace",
@@ -139,7 +141,7 @@ All labels:
 
 ## Built-in fonts
 
-Supported builtin fonts are: `overpass`, `opensans`, and `roboto`.
+Supported builtin fonts are: `overpass`, `opensans`, and `roboto`. They ship with bold versions.
 
 ## Examples
 

data/docs/LIBRARY.md

@@ -31,6 +31,7 @@ Here is an full example for creating the document object:
 ```ruby
 item = InvoicePrinter::Document::Item.new(
   name: 'Web consultation',
+  breakdown: 'Excludes 1h free consultation',
   quantity: nil,
   unit: 'hours',
   price: '$ 25',
@@ -64,6 +65,7 @@ invoice = InvoicePrinter::Document.new(
   bank_account_number: '156546546465',
   account_iban: 'IBAN464545645',
   account_swift: 'SWIFT5456',
+  description: 'We are invoicing the following items:',
   items: [item],
   note: 'A note...'
 )

data/docs/SERVER.md

@@ -61,6 +61,7 @@ Options:
 - `document` - JSON representation of the document
 - `labels` - JSON for labels
 - `font` - path to font file or builtin font name
+- `bold_font` - path to bold font file or builtin font name
 - `stamp` - path to stamp file
 - `logo` - path to logotype file
 - `background` - path to background file
@@ -103,6 +104,7 @@ Options:
 - `document` - JSON representation of the document
 - `labels` - JSON for labels
 - `font` - path to font file or builtin font name
+- `bold_font` - path to bold font file or builtin font name
 - `stamp` - path to stamp file
 - `logo` - path to logotype file
 - `background` - path to background file

data/examples/breakdown.rb

@@ -0,0 +1,77 @@
+#!/usr/bin/env ruby
+# This is an example of a longer invoice.
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'invoice_printer'
+
+labels = {
+  tax: '10% VAT'
+}
+
+item = InvoicePrinter::Document::Item.new(
+  name: 'Programming',
+  quantity: '10',
+  unit: 'h',
+  price: '$ 60',
+  tax: '$ 60',
+  amount: '$ 600'
+)
+
+item2 = InvoicePrinter::Document::Item.new(
+  name: 'Consulting',
+  breakdown: "Excludes 1 hour free consultation",
+  quantity: '10',
+  unit: 'h',
+  price: '$ 30',
+  tax: '$ 30',
+  amount: '$ 300'
+)
+
+breakdown = <<BREAKDOWN
+Issue 404: 15h
+Issue 505: 5h
+BREAKDOWN
+
+item3 = InvoicePrinter::Document::Item.new(
+  name: 'Support',
+  breakdown: breakdown,
+  quantity: '20',
+  unit: 'h',
+  price: '$ 15',
+  tax: '$ 30',
+  amount: '$ 330'
+)
+
+invoice = InvoicePrinter::Document.new(
+  number: 'NO. 198900000001',
+  provider_name: 'John White',
+  provider_lines: "79 Stonybrook St.\nBronx, NY 10457",
+  purchaser_name: 'Will Black',
+  purchaser_lines: "8648 Acacia Rd.\nBrooklyn, NY 11203",
+  issue_date: '05/03/2016',
+  due_date: '19/03/2016',
+  subtotal: '$ 1,000',
+  tax: '$ 100',
+  total: '$ 1,100',
+  bank_account_number: '156546546465',
+  items: [item, item2, item3],
+  note: 'This is a note at the end.'
+)
+
+InvoicePrinter.print(
+  document: invoice,
+  labels: labels,
+  stamp: File.expand_path('../stamp.png', __FILE__),
+  logo: File.expand_path('../prawn.png', __FILE__),
+  file_name: 'breakdown.pdf'
+)
+
+InvoicePrinter.print(
+  document: invoice,
+  labels: labels,
+  stamp: File.expand_path('../stamp.png', __FILE__),
+  logo: File.expand_path('../prawn.png', __FILE__),
+  file_name: 'breakdown_a4.pdf',
+  page_size: :a4
+)

data/examples/long_invoice.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# This is an example of a very simple invoice.
+# This is an example of a longer invoice.
 
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -12,7 +12,7 @@ labels = {
 item = InvoicePrinter::Document::Item.new(
   name: 'Programming',
   quantity: '10',
-  unit: 'hr',
+  unit: 'h',
   price: '$ 60',
   tax: '$ 60',
   amount: '$ 600'
@@ -21,7 +21,7 @@ item = InvoicePrinter::Document::Item.new(
 item2 = InvoicePrinter::Document::Item.new(
   name: 'Consulting',
   quantity: '10',
-  unit: 'hr',
+  unit: 'h',
   price: '$ 30',
   tax: '$ 30',
   amount: '$ 300'
@@ -30,7 +30,7 @@ item2 = InvoicePrinter::Document::Item.new(
 item3 = InvoicePrinter::Document::Item.new(
   name: 'Support',
   quantity: '20',
-  unit: 'hr',
+  unit: 'h',
   price: '$ 15',
   tax: '$ 30',
   amount: '$ 330'

data/examples/promo.rb

@@ -80,6 +80,7 @@ InvoicePrinter.print(
   document: invoice,
   labels: labels,
   font: File.expand_path('../../assets/fonts/overpass/Overpass-Regular.ttf', __FILE__),
+  bold_font: File.expand_path('../../assets/fonts/overpass/Overpass-Bold.ttf', __FILE__),
   logo: File.expand_path('../logo.png', __FILE__),
   file_name: 'promo.pdf'
 )
@@ -88,6 +89,7 @@ InvoicePrinter.print(
   document: invoice,
   labels: labels,
   font: File.expand_path('../../assets/fonts/overpass/Overpass-Regular.ttf', __FILE__),
+  bold_font: File.expand_path('../../assets/fonts/overpass/Overpass-Bold.ttf', __FILE__),
   logo: File.expand_path('../logo.png', __FILE__),
   file_name: 'promo_a4.pdf',
   page_size: :a4

data/examples/simple_invoice.rb

@@ -27,11 +27,13 @@ invoice = InvoicePrinter::Document.new(
   number: 'NO. 198900000001',
   provider_name: 'John White',
   provider_lines: provider_address,
+  purchaser_name: 'Will Black',
   purchaser_lines: purchaser_address,
   issue_date: '05/03/2016',
   due_date: '19/03/2016',
   total: '$ 900',
   bank_account_number: '156546546465',
+  description: "You can use 20% discount for the next order with the code:\nDISCOUNT",
   items: [item],
   note: "This is a note at the end.\nA note with two lines."
 )

data/invoice_printer.gemspec

@@ -45,8 +45,10 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.4'
 
   spec.add_dependency 'json', '~> 2.1'
-  spec.add_dependency 'prawn', '~> 2.2'
+  spec.add_dependency 'prawn', '~> 2.4'
   spec.add_dependency 'prawn-table', '~> 0.2.2'
+  spec.add_dependency 'matrix'
+  spec.add_dependency 'e2mmap'
 
   spec.add_development_dependency 'bundler', '>= 1.7'
   spec.add_development_dependency 'rake', '>= 10.0'

data/invoice_printer_fonts.gemspec

@@ -7,10 +7,13 @@ FONTS_FILES = [
   'FONTS_LICENSE.txt',
   'assets/fonts/overpass/OFL-1.1.txt',
   'assets/fonts/overpass/Overpass-Regular.ttf',
+  'assets/fonts/overpass/Overpass-Bold.ttf',
   'assets/fonts/opensans/Apache-2.0.txt',
   'assets/fonts/opensans/OpenSans-Regular.ttf',
+  'assets/fonts/opensans/OpenSans-Bold.ttf',
   'assets/fonts/roboto/Apache-2.0.txt',
   'assets/fonts/roboto/Roboto-Regular.ttf',
+  'assets/fonts/roboto/Roboto-Bold.ttf',
   'lib/invoice_printer/fonts.rb'
 ]
 

data/lib/invoice_printer/document/item.rb

@@ -6,6 +6,7 @@ module InvoicePrinter
     #
     #  item = InvoicePrinter::Document::Item.new(
     #    name: 'UX consultation',
+    #    breakdown: "Monday 3h\nTuesday 1h"
     #    variable: 'June 2008',
     #    quantity: '4',
     #    unit: 'hours',
@@ -18,6 +19,7 @@ module InvoicePrinter
     # but this is not enforced.
     class Item
       attr_reader :name,
+                  :breakdown,
                   :variable, # for anything required
                   :quantity,
                   :unit,
@@ -30,51 +32,55 @@ module InvoicePrinter
       class << self
         def from_json(json)
           new(
-            name:     json['name'],
+            name: json['name'],
+            breakdown: json['breakdown'],
             variable: json['variable'],
             quantity: json['quantity'],
-            unit:     json['unit'],
-            price:    json['price'],
-            tax:      json['tax'],
-            tax2:     json['tax2'],
-            tax3:     json['tax3'],
-            amount:   json['amount']
+            unit: json['unit'],
+            price: json['price'],
+            tax: json['tax'],
+            tax2: json['tax2'],
+            tax3: json['tax3'],
+            amount: json['amount']
           )
         end
       end
 
-      def initialize(name:     nil,
+      def initialize(name: nil,
+                     breakdown: nil,
                      variable: nil,
                      quantity: nil,
-                     unit:     nil,
-                     price:    nil,
-                     tax:      nil,
-                     tax2:     nil,
-                     tax3:     nil,
-                     amount:   nil)
+                     unit: nil,
+                     price: nil,
+                     tax: nil,
+                     tax2: nil,
+                     tax3: nil,
+                     amount: nil)
 
-        @name     = String(name)
+        @name = String(name)
+        @breakdown = String(breakdown)
         @variable = String(variable)
         @quantity = String(quantity)
-        @unit     = String(unit)
-        @price    = String(price)
-        @tax      = String(tax)
-        @tax2     = String(tax2)
-        @tax3     = String(tax3)
-        @amount   = String(amount)
+        @unit = String(unit)
+        @price = String(price)
+        @tax = String(tax)
+        @tax2 = String(tax2)
+        @tax3 = String(tax3)
+        @amount = String(amount)
       end
 
       def to_h
         {
-          'name':     @name,
+          'name': @name,
+          'breakdown': @breakdown,
           'variable': @variable,
           'quantity': @quantity,
-          'unit':     @unit,
-          'price':    @price,
-          'tax':      @tax,
-          'tax2':     @tax2,
-          'tax3':     @tax3,
-          'amount':   @amount,
+          'unit': @unit,
+          'price': @price,
+          'tax': @tax,
+          'tax2': @tax2,
+          'tax3': @tax3,
+          'amount': @amount,
         }
       end
 

data/lib/invoice_printer/document.rb

@@ -22,6 +22,7 @@ module InvoicePrinter
   #     bank_account_number: '156546546465',
   #     account_iban: 'IBAN464545645',
   #     account_swift: 'SWIFT5456',
+  #     description: "We are invoicing you the following items:",
   #     items: [
   #       InvoicePrinter::Document::Item.new,
   #       InvoicePrinter::Document::Item.new
@@ -57,6 +58,7 @@ module InvoicePrinter
                 :bank_account_number,
                 :account_iban,
                 :account_swift,
+                :description,
                 # Collection of InvoicePrinter::Invoice::Items
                 :items,
                 :note
@@ -84,6 +86,7 @@ module InvoicePrinter
           bank_account_number: json['bank_account_number'],
           account_iban: json['account_iban'],
           account_swift: json['account_swift'],
+          description: json['description'],
           note: json['note'],
 
           items: (json['items'] || []).map { |item_json| Item.from_json(item_json) }
@@ -111,6 +114,7 @@ module InvoicePrinter
                    bank_account_number: nil,
                    account_iban: nil,
                    account_swift:  nil,
+                   description: nil,
                    items: nil,
                    note: nil)
 
@@ -134,6 +138,7 @@ module InvoicePrinter
       @bank_account_number = String(bank_account_number)
       @account_iban = String(account_iban)
       @account_swift = String(account_swift)
+      @description = String(description)
       @items = items
       @note = String(note)
 
@@ -163,6 +168,7 @@ module InvoicePrinter
         'bank_account_number': @bank_account_number,
         'account_iban': @account_iban,
         'account_swift': @account_swift,
+        'description': @description,
         'items': @items.map(&:to_h),
         'note': @note
       }

data/lib/invoice_printer/pdf_document.rb

@@ -11,6 +11,7 @@ module InvoicePrinter
   #     document: invoice,
   #     labels: {},
   #     font: 'font.ttf',
+  #     bold_font: 'bold_font.ttf',
   #     stamp: 'stamp.jpg',
   #     logo: 'example.jpg'
   #   )
@@ -20,7 +21,7 @@ module InvoicePrinter
     class StampFileNotFound < StandardError; end
     class InvalidInput < StandardError; end
 
-    attr_reader :invoice, :labels, :file_name, :font, :stamp, :logo
+    attr_reader :invoice, :labels, :file_name, :font, :bold_font, :stamp, :logo
 
     DEFAULT_LABELS = {
       name: 'Invoice',
@@ -66,10 +67,20 @@ module InvoicePrinter
       @@labels = DEFAULT_LABELS.merge(labels)
     end
 
-    def initialize(document: Document.new, labels: {}, font: nil, stamp: nil, logo: nil, background: nil, page_size: :letter)
+    def initialize(
+      document: Document.new,
+      labels: {},
+      font: nil,
+      bold_font: nil,
+      stamp: nil,
+      logo: nil,
+      background: nil,
+      page_size: :letter
+    )
       @document  = document
       @labels    = merge_custom_labels(labels)
       @font      = font
+      @bold_font = bold_font
       @stamp     = stamp
       @logo      = logo
       @page_size = page_size ? PAGE_SIZES[page_size.to_sym] : PAGE_SIZES[:letter]
@@ -94,8 +105,10 @@ module InvoicePrinter
         end
       end
 
-      if used? @font
-        use_font(@font)
+      if used?(@font) && used?(@bold_font)
+        use_font(@font, @bold_font)
+      elsif used?(@font)
+        use_font(@font, @font)
       end
 
       build_pdf
@@ -113,11 +126,11 @@ module InvoicePrinter
 
     private
 
-    def use_font(font)
-      if File.exist?(@font)
-        set_font_from_path(@font)
+    def use_font(font, bold_font)
+      if File.exist?(font) && File.exist?(bold_font)
+        set_font_from_path(font, bold_font)
       else
-        set_builtin_font(@font)
+        set_builtin_font(font)
       end
     end
 
@@ -134,14 +147,14 @@ module InvoicePrinter
     end
 
     # Add font family in Prawn for a given +font+ file
-    def set_font_from_path(font)
+    def set_font_from_path(font, bold_font)
       font_name = Pathname.new(font).basename
       @pdf.font_families.update(
         "#{font_name}" => {
           normal: font,
           italic: font,
-          bold: font,
-          bold_italic: font
+          bold: bold_font,
+          bold_italic: bold_font
         }
       )
       @pdf.font(font_name)
@@ -158,6 +171,7 @@ module InvoicePrinter
       build_purchaser_box
       build_payment_method_box
       build_info_box
+      build_description
       build_items
       build_total
       build_stamp
@@ -241,18 +255,14 @@ module InvoicePrinter
       end
       # Render provider_lines if present
       if !@document.provider_lines.empty?
-        lines = @document.provider_lines.split("\n")
-        line_y = 618
-        lines.each_with_index do |line, index|
-          next if index > 3
-
-          @pdf.text_box(
-            "#{line}",
-            size: 10,
-            at: [10, y(line_y - index*15) - @push_down],
-            width: x(240)
-          )
-        end
+        @pdf.text_box(
+          @document.provider_lines,
+          size: 10,
+          at: [x(10), y(618) - @push_down],
+          width: x(246),
+          height: y(68),
+          leading: 3,
+        )
       end
       unless @document.provider_tax_id.empty?
         @pdf.text_box(
@@ -311,18 +321,14 @@ module InvoicePrinter
       end
       # Render purchaser_lines if present
       if !@document.purchaser_lines.empty?
-        lines = @document.purchaser_lines.split("\n")
-        line_y = 618
-        lines.each_with_index do |line, index|
-          next if index > 3
-
-          @pdf.text_box(
-            "#{line}",
-            size: 10,
-            at: [x(284), y(line_y - index*15) - @push_down],
-            width: x(240)
-          )
-        end
+        @pdf.text_box(
+          @document.purchaser_lines,
+          size: 10,
+          at: [x(284), y(618) - @push_down],
+          width: x(246),
+          height: y(68),
+          leading: 3,
+        )
       end
       unless @document.purchaser_tax_id.empty?
         @pdf.text_box(
@@ -637,6 +643,25 @@ module InvoicePrinter
       used?(@labels[:sublabels][:variable_symbol])
     end
 
+    def build_description
+      unless @document.description.empty?
+        @pdf.text_box(
+          @document.description,
+          size: 11,
+          align: :left,
+          at: [0, y(450) - @push_down - 26]
+        )
+        @push_items_table += description_height + 8
+      end
+    end
+
+     def description_height
+      @description_height ||= begin
+        num_of_lines = @document.description.lines.count
+        (num_of_lines * 13)
+      end
+    end
+
     # Build the following table for document items:
     #
     #   =================================================================
@@ -708,7 +733,8 @@ module InvoicePrinter
     def build_items_data(items_params)
       @document.items.map do |item|
         line = []
-        line << { content: item.name, borders: [:bottom], align: :left } if items_params[:names]
+        line << { content: name_cell(item), borders: [:bottom] } if items_params[:names]
+        #line << { content: item.name, borders: [:bottom], align: :left } if items_params[:names]
         line << { content: item.variable, align: :right } if items_params[:variables]
         line << { content: item.quantity, align: :right } if items_params[:quantities]
         line << { content: item.unit, align: :right } if items_params[:units]
@@ -721,6 +747,27 @@ module InvoicePrinter
       end
     end
 
+    # Display item's name and breakdown if present
+    def name_cell(item)
+      data = if used?(item.breakdown)
+        data = [
+          [{ content: item.name, padding: [5, 0, 0, 5] }],
+          [{ content: item.breakdown, size: 8, padding: [2, 0, 5, 5] }]
+        ]
+
+        options = {
+          cell_style: {
+            borders: []
+          },
+          position: :left
+        }
+
+        @pdf.make_table(data, options)
+      else
+        item.name
+      end
+    end
+
     # Include only relevant headers
     def build_items_header(items_params)
       headers = []
@@ -759,52 +806,40 @@ module InvoicePrinter
       @pdf.move_down(25)
 
       items = []
-      items << [{ content: "#{@labels[:subtotal]}:#{build_sublabel_for_total_table(:subtotal)}", align: :right }, @document.subtotal] \
-        unless @document.subtotal.empty?
-      items << [{ content: "#{@labels[:tax]}:#{build_sublabel_for_total_table(:tax)}", align: :right }, @document.tax] \
-        unless @document.tax.empty?
-      items << [{ content: "#{@labels[:tax2]}:#{build_sublabel_for_total_table(:tax2)}", align: :right }, @document.tax2] \
-        unless @document.tax2.empty?
-      items << [{ content: "#{@labels[:tax3]}:#{build_sublabel_for_total_table(:tax3)}", align: :right }, @document.tax3] \
-        unless @document.tax3.empty?
-
-      width = [
-        "#{@labels[:subtotal]}#{@document.subtotal}".size,
-        "#{@labels[:tax]}#{@document.tax}".size,
-        "#{@labels[:tax2]}#{@document.tax2}".size,
-        "#{@labels[:tax3]}#{@document.tax3}".size
-      ].max * 8
 
-      options = {
-        cell_style: {
-          borders: []
-        }
-      }
+      items << [
+        { content: "#{@labels[:subtotal]}:#{build_sublabel_for_total_table(:subtotal)}", align: :left },
+        { content: @document.subtotal, align: :right }
+      ] unless @document.subtotal.empty?
 
-      @pdf.span(x(width), position: :right) do
-        @pdf.table(items, options) unless items.empty?
-      end
+      items << [
+        { content: "#{@labels[:tax]}:#{build_sublabel_for_total_table(:tax)}", align: :left },
+        { content:  @document.tax, align: :right }
+      ] unless @document.tax.empty?
 
-      @pdf.move_down(15)
+      items << [
+        { content: "#{@labels[:tax2]}:#{build_sublabel_for_total_table(:tax2)}", align: :left },
+        { content:  @document.tax2, align: :right }
+      ] unless @document.tax2.empty?
 
-      unless @document.total.empty?
-        @pdf.text(
-          "#{@labels[:total]}:   #{@document.total}",
-          size: 16,
-          align: :right,
-          style: :bold
-        )
+      items << [
+        { content: "#{@labels[:tax3]}:#{build_sublabel_for_total_table(:tax3)}", align: :left },
+        { content:  @document.tax3, align: :right }
+      ] unless @document.tax3.empty?
 
-        @pdf.move_down(5)
+      items << [
+        { content: "\n#{@labels[:total]}:#{build_sublabel_for_total_table(:total)}", align: :left, font_style: :bold, size: 16 },
+        { content:  "\n#{@document.total}", align: :right, font_style: :bold, size: 16 }
+      ] unless @document.total.empty?
 
-        if used? @labels[:sublabels][:total]
-          @pdf.text(
-            "#{@labels[:sublabels][:total]}:   #{@document.total}",
-            size: 12,
-            align: :right
-          )
-        end
-      end
+      options = {
+        cell_style: {
+          borders: []
+        },
+        position: :right
+      }
+
+      @pdf.table(items, options) unless items.empty?
     end
 
     # Return sublabel on a new line or empty string
@@ -822,7 +857,7 @@ module InvoicePrinter
     def build_logo
       if @logo && !@logo.empty?
         bottom = @document.note.empty? ? 75 : (75 + note_height)
-        @pdf.image(@logo, at: [0, bottom], fit: [200, 50])
+        @pdf.image(@logo, at: [0, bottom], fit: [x(200), y(50)])
       end
     end
 
@@ -830,7 +865,7 @@ module InvoicePrinter
     def build_stamp
       if @stamp && !@stamp.empty?
         @pdf.move_down(15)
-        @pdf.image(@stamp, position: :right)
+        @pdf.image(@stamp, position: :right, fit: [x(200), y(40)])
       end
     end
 

data/lib/invoice_printer/version.rb

@@ -1,3 +1,3 @@
 module InvoicePrinter
-  VERSION = '2.2.0.alpha1'
+  VERSION = '2.3.0'
 end

data/lib/invoice_printer.rb

@@ -15,6 +15,7 @@ Prawn::Font::AFM.hide_m17n_warning = true
 #   InvoicePrinter.print(
 #     document: invoice,
 #     font: 'path-to-font-file.ttf',
+#     bold_font: 'path-to-font-file.ttf',
 #     stamp: 'stamp.jpg',
 #     logo: 'logo.jpg',
 #     file_name: 'invoice.pdf'
@@ -65,16 +66,28 @@ module InvoicePrinter
   # document - InvoicePrinter::Document object
   # labels - labels to override
   # font - font file to use
+  # bold_font - bold font file to use
   # stamp - stamp & signature (image)
   # logo - logotype (image)
   # background - background (image)
   # page_size - :letter or :a4
   # file_name - output file
-  def self.print(document:, labels: {}, font: nil, stamp: nil, logo: nil, background: nil, page_size: :letter, file_name:)
+  def self.print(
+    document:,
+    labels: {},
+    font: nil,
+    bold_font: nil,
+    stamp: nil,
+    logo: nil,
+    background: nil,
+    page_size: :letter,
+    file_name:
+  )
     PDFDocument.new(
       document: document,
       labels: labels,
       font: font,
+      bold_font: bold_font,
       stamp: stamp,
       logo: logo,
       background: background,
@@ -87,15 +100,26 @@ module InvoicePrinter
   # document - InvoicePrinter::Document object
   # labels - labels to override
   # font - font file to use
+  # bold_font - bold font file to use
   # stamp - stamp & signature (image)
   # logo - logotype (image)
   # background - background (image)
   # page_size - :letter or :a4
-  def self.render(document:, labels: {}, font: nil, stamp: nil, logo: nil, background: nil, page_size: :letter)
+  def self.render(
+    document:,
+    labels: {},
+    font: nil,
+    bold_font: nil,
+    stamp: nil,
+    logo: nil,
+    background: nil,
+    page_size: :letter
+  )
     PDFDocument.new(
       document: document,
       labels: labels,
       font: font,
+      bold_font: bold_font,
       stamp: stamp,
       logo: logo,
       background: background,

data/regenerate.rb

@@ -0,0 +1,10 @@
+# Script to regenerate all examples
+examples_directory = File.expand_path('../examples', __FILE__)
+@examples = Dir.glob("#{examples_directory}/*.rb")
+
+@examples.each do |example|
+  puts "Running #{example}"
+  Dir.chdir(examples_directory) do
+    `ruby #{example}`
+  end
+end

data/test/examples_test.rb

@@ -4,10 +4,12 @@ require 'test_helper'
 class ExamplesTest < Minitest::Test
   def setup
     examples_directory = File.expand_path('../../examples', __FILE__)
+    assets_directory = File.expand_path('../../assets', __FILE__)
     @examples = Dir.glob("#{examples_directory}/*.rb")
     @test_dir = File.absolute_path('./tmp/invoice_printer_examples')
     FileUtils.mkdir_p @test_dir
     FileUtils.copy_entry examples_directory, @test_dir
+    FileUtils.cp_r assets_directory, File.absolute_path('./tmp/')
   end
 
   def teardown

data/test/test_ext.rb

@@ -101,7 +101,8 @@ module InvoicePrinter
       strings << @document.tax2
       strings << "#{@labels[:tax3]}:"
       strings << @document.tax3
-      strings << "#{@labels[:total]}:   #{@document.total}"
+      strings << "#{@labels[:total]}:"
+      strings << @document.total
       strings
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoice_printer
 version: !ruby/object:Gem::Version
-  version: 2.2.0.alpha1
+  version: 2.3.0
 platform: ruby
 authors:
 - Josef Strzibny
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2023-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: prawn-table
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: e2mmap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -95,12 +123,16 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/fonts/opensans/OpenSans-Bold.ttf
+- assets/fonts/overpass/Overpass-Bold.ttf
+- assets/fonts/roboto/Roboto-Bold.ttf
 - benchmarks/render.yml
 - bin/invoice_printer
 - docs/COMMAND_LINE.md
 - docs/INSTALLATION.md
 - docs/LIBRARY.md
 - docs/SERVER.md
+- examples/breakdown.rb
 - examples/clients/node.js
 - examples/complex_invoice.rb
 - examples/czech_invoice.rb
@@ -120,6 +152,7 @@ files:
 - lib/invoice_printer/document/item.rb
 - lib/invoice_printer/pdf_document.rb
 - lib/invoice_printer/version.rb
+- regenerate.rb
 - test/api_test.rb
 - test/background_test.rb
 - test/cli_test.rb
@@ -138,7 +171,7 @@ homepage: https://github.com/strzibny/invoice_printer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,12 +182,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Super simple PDF invoicing in pure Ruby
 test_files: