invoice_printer 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33a87300d4ff6a12080b758ea012b7c94a09521575c99579e300844dbfbf0e47
-  data.tar.gz: 33446dc1314512a7793ad95b73065dfb59abef1963e5c115fab5263e2dd53ecc
+  metadata.gz: 2f98cb9145f19c42e95490c56afbb156408c5049c766d9ddcb1c776ee112c5fe
+  data.tar.gz: 77c6280ab4566b41ad6b040113f3ccf99b0c4bf5e2bccce28c3d0740644a1e57
 SHA512:
-  metadata.gz: ef29b3e26227c6cbeba87fca78154d55a7bb103472f77991fe1a4df24f30a36efa75db3f7f724ddd17a369713870db6d20bd93ea33d0812fb55501bbba9c7ea2
-  data.tar.gz: 6c93d97f040190c555dcbdaf742e05d904a00bd458e2f68009dd1191ec3bf190fe92e20033bb19e0ae3337f6e10686361922b05bcfcc6316e86f8bb46b7a0cbf
+  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.2.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.2.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

@@ -2,8 +2,10 @@ PATH
   remote: .
   specs:
     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.2.0)
       invoice_printer (= 2.2.0)
@@ -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.5.1)
-    minitest (5.14.2)
-    nio4r (2.5.7)
+    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.3.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.45.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/docs/COMMAND_LINE.md

@@ -49,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",

data/docs/LIBRARY.md

@@ -65,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/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/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

@@ -171,6 +171,7 @@ module InvoicePrinter
       build_purchaser_box
       build_payment_method_box
       build_info_box
+      build_description
       build_items
       build_total
       build_stamp
@@ -254,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(
@@ -324,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(
@@ -650,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:
     #
     #   =================================================================
@@ -845,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
 
@@ -853,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'
+  VERSION = '2.3.0'
 end

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoice_printer
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Josef Strzibny
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-17 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
@@ -124,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
@@ -142,7 +171,7 @@ homepage: https://github.com/strzibny/invoice_printer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Super simple PDF invoicing in pure Ruby
 test_files: