invoice_printer 2.0.0.beta3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0b5acb10995e69d8aba7d44d9e7d71ce5e9b9104cf5883fec574ada600501b0
-  data.tar.gz: 3ccaa20f6baeee71cf879cdf74687e6da7ab6441fa5583199fa547d3e5afd34f
+  metadata.gz: 97ea4a809c4a18acd04d91edcef4d1950468c230a417e7df3908ecc03eb53766
+  data.tar.gz: ffc3a08b88914e8761fa925b6a3b6ff11e47b2e49e9c2542d566f358c378adbb
 SHA512:
-  metadata.gz: 84cf91f9a5f2445dbe62491e7f51c05e4bfaf3d9c5d58881db035a964c2114a9d02fca485f300b15fc8cb87efea05d2c24d60822c1f9c01145dd1eeba62c22cd
-  data.tar.gz: aa5566034f52a87d9c7ee432fc485fd233407a82f591ded208a880f0d214aea3c39cc6241add8bfffbcb3abe07311214cb47ff0daec20f1e7ea4ad5a92b131c8
+  metadata.gz: 45b38f99524e0a0b6b44028ec55e4cdce79fcdfcf8c9cf6a40b8cc4878a26da59cb55cf90038bbb56142cd210873f9e534cc8e5156b5a426a19d0305bf404239
+  data.tar.gz: d5369bc2301aaa7ae07d7196a2ccc3363fb8827776c155bf668747775699e3c6f7691a5a090f3ce2fdda325891a2e39ccb7a5c9fbf07c0619ccb13820eb8aeae

data/Dockerfile

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

data/Gemfile.lock

@@ -1,7 +1,12 @@
 PATH
   remote: .
   specs:
-    invoice_printer_server (2.0.0.alpha1)
+    invoice_printer (2.0.0.beta3)
+      json (~> 2.1)
+      prawn (~> 2.2)
+      prawn-table (~> 0.2.2)
+    invoice_printer_server (2.0.0.beta3)
+      invoice_printer (= 2.0.0.beta3)
       json (~> 2.1)
       puma (>= 3.9.0)
       roda (~> 3.5)
@@ -20,26 +25,32 @@ GEM
     hashery (2.1.2)
     json (2.2.0)
     minitest (5.11.3)
-    nio4r (2.3.1)
+    nio4r (2.5.1)
+    pdf-core (0.7.0)
     pdf-inspector (1.3.0)
       pdf-reader (>= 1.0, < 3.0.a)
-    pdf-reader (2.2.0)
+    pdf-reader (2.2.1)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    puma (4.0.0)
+    prawn (2.2.2)
+      pdf-core (~> 0.7.0)
+      ttfunk (~> 1.5)
+    prawn-table (0.2.2)
+      prawn (>= 1.3.0, < 3.0.0)
+    puma (4.1.0)
       nio4r (~> 2.0)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rake (10.5.0)
+    rake (12.3.3)
     rmagick (2.16.0)
-    roda (3.21.0)
+    roda (3.23.0)
       rack
     ruby-rc4 (0.1.5)
-    ttfunk (1.4.0)
+    ttfunk (1.5.1)
 
 PLATFORMS
   ruby

data/examples/international_invoice.rb

@@ -80,7 +80,7 @@ InvoicePrinter.print(
   document: invoice,
   labels: labels,
   font: 'overpass',
-  logo: 'prawn.png',
+  logo: File.expand_path('../prawn.png', __FILE__),
   file_name: 'international_invoice.pdf'
 )
 
@@ -88,7 +88,7 @@ InvoicePrinter.print(
   document: invoice,
   labels: labels,
   font: 'overpass',
-  logo: 'prawn.png',
+  logo: File.expand_path('../prawn.png', __FILE__),
   file_name: 'international_invoice_a4.pdf',
   page_size: :a4
 )

data/examples/long_invoice.rb

@@ -55,16 +55,16 @@ invoice = InvoicePrinter::Document.new(
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  stamp: 'stamp.png',
-  logo: 'prawn.png',
+  stamp: File.expand_path('../stamp.png', __FILE__),
+  logo: File.expand_path('../prawn.png', __FILE__),
   file_name: 'long_invoice.pdf'
 )
 
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  stamp: 'stamp.png',
-  logo: 'prawn.png',
+  stamp: File.expand_path('../stamp.png', __FILE__),
+  logo: File.expand_path('../prawn.png', __FILE__),
   file_name: 'long_invoice_a4.pdf',
   page_size: :a4
 )

data/examples/promo.rb

@@ -46,20 +46,24 @@ second_item = InvoicePrinter::Document::Item.new(
   amount: 'Kč 9.000'
 )
 
+provider_address = <<ADDRESS
+Rolnická 1
+747 05  Opava
+Kateřinky
+ADDRESS
+
+purchaser_address = <<ADDRESS
+Ostravská 1
+747 70  Opava
+ADDRESS
+
 invoice = InvoicePrinter::Document.new(
   number: 'č. 198900000001',
   provider_name: 'Petr Nový',
+  provider_lines:  provider_address,
   provider_tax_id: '56565656',
-  provider_street: 'Rolnická',
-  provider_street_number: '1',
-  provider_postcode: '747 05',
-  provider_city: 'Opava',
-  provider_city_part: 'Kateřinky',
   purchaser_name: 'Adam Černý',
-  purchaser_street: 'Ostravská',
-  purchaser_street_number: '1',
-  purchaser_postcode: '747 70',
-  purchaser_city: 'Opava',
+  purchaser_lines: purchaser_address,
   issue_date: '05/03/2016',
   due_date: '19/03/2016',
   subtotal: 'Kč 10.000',
@@ -75,16 +79,16 @@ invoice = InvoicePrinter::Document.new(
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  font: File.expand_path('../../../assets/fonts/overpass/Overpass-Regular.ttf', __FILE__),
-  logo: 'logo.png',
+  font: File.expand_path('../../assets/fonts/overpass/Overpass-Regular.ttf', __FILE__),
+  logo: File.expand_path('../logo.png', __FILE__),
   file_name: 'promo.pdf'
 )
 
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  font: File.expand_path('../../../assets/fonts/overpass/Overpass-Regular.ttf', __FILE__),
-  logo: 'logo.png',
+  font: File.expand_path('../../assets/fonts/overpass/Overpass-Regular.ttf', __FILE__),
+  logo: File.expand_path('../logo.png', __FILE__),
   file_name: 'promo_a4.pdf',
   page_size: :a4
 )

data/examples/provider_purchaser_lines.rb

@@ -94,7 +94,7 @@ InvoicePrinter.print(
   document: invoice,
   labels: labels,
   font: 'overpass',
-  logo: 'prawn.png',
+  logo: File.expand_path('../prawn.png', __FILE__),
   file_name: 'provider_purchaser_lines.pdf'
 )
 
@@ -102,7 +102,7 @@ InvoicePrinter.print(
   document: invoice,
   labels: labels,
   font: 'overpass',
-  logo: 'prawn.png',
+  logo: File.expand_path('../prawn.png', __FILE__),
   file_name: 'provider_purchaser_lines_a4.pdf',
   page_size: :a4
 )

data/examples/simple_invoice.rb

@@ -39,13 +39,13 @@ invoice = InvoicePrinter::Document.new(
 
 InvoicePrinter.print(
   document: invoice,
-  logo: 'prawn.png',
+  logo: File.expand_path('../prawn.png', __FILE__),
   file_name: 'simple_invoice.pdf'
 )
 
 InvoicePrinter.print(
   document: invoice,
-  logo: 'prawn.png',
+  logo: File.expand_path('../prawn.png', __FILE__),
   file_name: 'simple_invoice_a4.pdf',
   page_size: :a4
 )

data/invoice_printer.gemspec

@@ -44,8 +44,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.4'
 
   spec.add_dependency 'json', '~> 2.1'
-  spec.add_dependency 'prawn', '~> 2.1.0'
-  spec.add_dependency 'prawn-layout', '~> 0.8.4'
+  spec.add_dependency 'prawn', '~> 2.2'
+  spec.add_dependency 'prawn-table', '~> 0.2.2'
 
   spec.add_development_dependency 'bundler', '>= 1.7'
   spec.add_development_dependency 'rake', '>= 10.0'

data/invoice_printer_fonts.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Super simple PDF invoicing in pure Ruby'
   spec.description   = 'Super simple and fast PDF invoicing in pure Ruby (based on Prawn library).'
   spec.homepage      = 'https://github.com/strzibny/invoice_printer'
-  spec.license       = 'MIT'
+  spec.licenses      = ['MIT', 'OFL 1.1', 'Apache 2.0']
 
   # Include only font files
   spec.files         = FONTS_FILES

data/lib/invoice_printer/pdf_document.rb

@@ -181,6 +181,7 @@ module InvoicePrinter
       @push_down = 0
       @push_items_table = 0
       @pdf.fill_color '000000'
+      @pdf.stroke_color 'aaaaaa'
       build_header
       build_provider_box
       build_purchaser_box
@@ -700,26 +701,28 @@ module InvoicePrinter
       items_params = determine_items_structure
       items = build_items_data(items_params)
       headers = build_items_header(items_params)
+      data = items.prepend(headers)
 
-      styles = {
-        headers: headers,
-        row_colors: ['F5F5F5', nil],
+      options = {
+        header: true,
+        row_colors: [nil, 'ededed'],
         width: x(540, 2),
-        align: {
-          0 => :left,
-          1 => :right,
-          2 => :right,
-          3 => :right,
-          4 => :right,
-          5 => :right,
-          6 => :right,
-          7 => :right,
-          8 => :right
-        },
-        font_size: 10
+        cell_style: {
+          borders: []
+        }
       }
 
-      @pdf.table(items, styles) unless items.empty?
+      unless items.empty?
+        @pdf.font_size(10) do
+          @pdf.table(data, options) do
+            row(0).background_color = 'e3e3e3'
+            row(0).border_color = 'aaaaaa'
+            row(0).borders = [:bottom]
+            row(items.size - 1).borders = [:bottom]
+            row(items.size - 1).border_color = 'd9d9d9'
+          end
+        end
+      end
     end
 
     # Determine sections of the items table to show based on provided data
@@ -743,15 +746,15 @@ module InvoicePrinter
     def build_items_data(items_params)
       @document.items.map do |item|
         line = []
-        line << item.name if items_params[:names]
-        line << item.variable if items_params[:variables]
-        line << item.quantity if items_params[:quantities]
-        line << item.unit if items_params[:units]
-        line << item.price if items_params[:prices]
-        line << item.tax if items_params[:taxes]
-        line << item.tax2 if items_params[:taxes2]
-        line << item.tax3 if items_params[:taxes3]
-        line << item.amount if items_params[:amounts]
+        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]
+        line << { content: item.price, align: :right } if items_params[:prices]
+        line << { content: item.tax, align: :right } if items_params[:taxes]
+        line << { content: item.tax2, align: :right } if items_params[:taxes2]
+        line << { content: item.tax3, align: :right } if items_params[:taxes3]
+        line << { content: item.amount, align: :right } if items_params[:amounts]
         line
       end
     end
@@ -759,15 +762,15 @@ module InvoicePrinter
     # Include only relevant headers
     def build_items_header(items_params)
       headers = []
-      headers << { text: label_with_sublabel(:item) } if items_params[:names]
-      headers << { text: label_with_sublabel(:variable) } if items_params[:variables]
-      headers << { text: label_with_sublabel(:quantity) } if items_params[:quantities]
-      headers << { text: label_with_sublabel(:unit) } if items_params[:units]
-      headers << { text: label_with_sublabel(:price_per_item) } if items_params[:prices]
-      headers << { text: label_with_sublabel(:tax) } if items_params[:taxes]
-      headers << { text: label_with_sublabel(:tax2) } if items_params[:taxes2]
-      headers << { text: label_with_sublabel(:tax3) } if items_params[:taxes3]
-      headers << { text: label_with_sublabel(:amount) } if items_params[:amounts]
+      headers << { content: label_with_sublabel(:item), align: :left } if items_params[:names]
+      headers << { content: label_with_sublabel(:variable), align: :right } if items_params[:variables]
+      headers << { content: label_with_sublabel(:quantity), align: :right } if items_params[:quantities]
+      headers << { content: label_with_sublabel(:unit), align: :right } if items_params[:units]
+      headers << { content: label_with_sublabel(:price_per_item), align: :right } if items_params[:prices]
+      headers << { content: label_with_sublabel(:tax), align: :right } if items_params[:taxes]
+      headers << { content: label_with_sublabel(:tax2), align: :right } if items_params[:taxes2]
+      headers << { content: label_with_sublabel(:tax3), align: :right } if items_params[:taxes3]
+      headers << { content: label_with_sublabel(:amount), align: :right } if items_params[:amounts]
       headers
     end
 
@@ -794,13 +797,13 @@ module InvoicePrinter
       @pdf.move_down(25)
 
       items = []
-      items << ["#{@labels[:subtotal]}:#{build_sublabel_for_total_table(:subtotal)}", @document.subtotal] \
+      items << [{ content: "#{@labels[:subtotal]}:#{build_sublabel_for_total_table(:subtotal)}", align: :right }, @document.subtotal] \
         unless @document.subtotal.empty?
-      items << ["#{@labels[:tax]}:#{build_sublabel_for_total_table(:tax)}", @document.tax] \
+      items << [{ content: "#{@labels[:tax]}:#{build_sublabel_for_total_table(:tax)}", align: :right }, @document.tax] \
         unless @document.tax.empty?
-      items << ["#{@labels[:tax2]}:#{build_sublabel_for_total_table(:tax2)}", @document.tax2] \
+      items << [{ content: "#{@labels[:tax2]}:#{build_sublabel_for_total_table(:tax2)}", align: :right }, @document.tax2] \
         unless @document.tax2.empty?
-      items << ["#{@labels[:tax3]}:#{build_sublabel_for_total_table(:tax3)}", @document.tax3] \
+      items << [{ content: "#{@labels[:tax3]}:#{build_sublabel_for_total_table(:tax3)}", align: :right }, @document.tax3] \
         unless @document.tax3.empty?
 
       width = [
@@ -810,16 +813,14 @@ module InvoicePrinter
         "#{@labels[:tax3]}#{@document.tax3}".size
       ].max * 8
 
-      styles = {
-        border_width: 0,
-        align: {
-          0 => :right,
-          1 => :left
+      options = {
+        cell_style: {
+          borders: []
         }
       }
 
       @pdf.span(x(width), position: :right) do
-        @pdf.table(items, styles) unless items.empty?
+        @pdf.table(items, options) unless items.empty?
       end
 
       @pdf.move_down(15)

data/lib/invoice_printer/version.rb

@@ -1,3 +1,3 @@
 module InvoicePrinter
-  VERSION = '2.0.0.beta3'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoice_printer
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
+  version: 2.0.0
 platform: ruby
 authors:
 - Josef Strzibny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: prawn-layout
+  name: prawn-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -153,9 +153,9 @@ 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.0.3
 signing_key: