invoice_printer 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a929bb5d414cc64bf5f30a97baa8b7b39e9a3bb12eb03efe96eab827bc417b4
-  data.tar.gz: a1ab11498fed952e4d008aa93d00e2ab2be4b73a65cb38d03e04aa226d027e5e
+  metadata.gz: 253de7f5df575343e45fad182f3a6e62fca98cac0758da832361f15b1a11ddbb
+  data.tar.gz: fe9755f88c5b148829050a565d9bcb043e3e1b36c64b7bbd2e5519fd3a4542fb
 SHA512:
-  metadata.gz: e93b4d97f28e264dd6385776a49852614ad454fdbe80d00e2d66d3dd98c7614a9c74953a02d30744eb5a148ce250e6418c20a7107a32d0400062e5311f79ac49
-  data.tar.gz: 2c1907bb3b0e0fc111139f9fdf808dd869c0dc41d359cee43cd1178919670c312be30361c362e74a0a76f8771b6d925a1edaff358348bba68676e3e821ec316b
+  metadata.gz: 4a603e7f39acc192dbd81efe372538df190ae4ac90eb15b0a8103477030663162bdcdfd5647cfc98455e756028109b5eb3c91e0a312e5862d72ea88d2a5f3b5e
+  data.tar.gz: 63e01b1748787113d5d70d4dca62aa20501588ae9b9a74fe1a8944d61a5c78e8a9c66a4208d5d78fa01ba0df1029b6ec4f01ae3b207eadf49d293bae9cea5c33

data/docs/LIBRARY.md

@@ -233,6 +233,8 @@ InvoicePrinter.print(
 )
 ```
 
+If you don't have a font around, you can install `dejavu-fonts` gem and specify "dejavu" as the font path.
+
 We recommend you DejaVuSans and Overpass fonts.
 
 ### Background

data/lib/invoice_printer/pdf_document.rb

@@ -94,11 +94,7 @@ module InvoicePrinter
       end
 
       if used? @font
-        if File.exist?(@font)
-          set_fonts(@font) if @font
-        else
-          raise FontFileNotFound, "Font file not found at #{@font}"
-        end
+        use_font(@font)
       end
 
       # Version 2.1 deprecation warnings
@@ -146,8 +142,36 @@ module InvoicePrinter
 
     private
 
+    def use_font(font)
+      if File.exist?(@font)
+        set_font_from_path(@font)
+      elsif @font == 'dejavu'
+        set_dejavu_font
+      else
+        raise FontFileNotFound, "Font file not found at #{font}"
+      end
+    end
+
+    # DejaVu from dejavu-fonts gem
+    def set_dejavu_font
+      require 'dejavu-fonts'
+      font_name = 'dejavu'
+
+      @pdf.font_families.update(
+        "#{font_name}" => {
+          normal: DejaVu::Fonts.paths[:normal],
+          italic: DejaVu::Fonts.paths[:italic],
+          bold: DejaVu::Fonts.paths[:bold],
+          bold_italic: DejaVu::Fonts.paths[:bold_italic]
+        }
+      )
+      @pdf.font(font_name)
+    rescue
+      raise FontFileNotFound, "Font file not found for #{font}"
+    end
+
     # Add font family in Prawn for a given +font+ file
-    def set_fonts(font)
+    def set_font_from_path(font)
       font_name = Pathname.new(font).basename
       @pdf.font_families.update(
         "#{font_name}" => {
@@ -447,7 +471,6 @@ module InvoicePrinter
       end
 
       # Match the height of next box if needed
-      # TODO: it's smaller without sublabels
       min_height = 60
       if used?(@document.issue_date) || used?(@document.due_date)
         min_height = (used?(@document.issue_date) && used?(@document.due_date)) ? 75 : 60
@@ -467,7 +490,8 @@ module InvoicePrinter
           at: [10, y(483) - @push_down],
           width: x(234)
         )
-        @pdf.stroke_rounded_rectangle([0, 508 - @push_down], 270, 45, 6)
+
+        @pdf.stroke_rounded_rectangle([0, y(508) - @push_down], x(266), @payment_box_height, 6)
       else
         @payment_box_height = 60
         @push_iban = 0
@@ -654,6 +678,7 @@ module InvoicePrinter
         height = @payment_box_height if @payment_box_height > height
 
         @pdf.stroke_rounded_rectangle([x(274), y(508) - @push_down], x(266), height, 6)
+        @push_items_table += 12 if @push_items_table <= 18
       end
     end
 

data/lib/invoice_printer/version.rb

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

data/test/api_test.rb

@@ -73,6 +73,6 @@ class ApiTest < Minitest::Test
     body = JSON.parse last_response.body
 
     assert last_response.ok?
-    assert_equal body, { 'result' => 'ok', 'data' => Base64.encode64(output) }
+    assert_equal body, { 'result' => 'ok', 'data' => Base64.strict_encode64(output) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoice_printer
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Josef Strzibny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json