invoice_printer 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 253de7f5df575343e45fad182f3a6e62fca98cac0758da832361f15b1a11ddbb
-  data.tar.gz: fe9755f88c5b148829050a565d9bcb043e3e1b36c64b7bbd2e5519fd3a4542fb
+  metadata.gz: d0b5acb10995e69d8aba7d44d9e7d71ce5e9b9104cf5883fec574ada600501b0
+  data.tar.gz: 3ccaa20f6baeee71cf879cdf74687e6da7ab6441fa5583199fa547d3e5afd34f
 SHA512:
-  metadata.gz: 4a603e7f39acc192dbd81efe372538df190ae4ac90eb15b0a8103477030663162bdcdfd5647cfc98455e756028109b5eb3c91e0a312e5862d72ea88d2a5f3b5e
-  data.tar.gz: 63e01b1748787113d5d70d4dca62aa20501588ae9b9a74fe1a8944d61a5c78e8a9c66a4208d5d78fa01ba0df1029b6ec4f01ae3b207eadf49d293bae9cea5c33
+  metadata.gz: 84cf91f9a5f2445dbe62491e7f51c05e4bfaf3d9c5d58881db035a964c2114a9d02fca485f300b15fc8cb87efea05d2c24d60822c1f9c01145dd1eeba62c22cd
+  data.tar.gz: aa5566034f52a87d9c7ee432fc485fd233407a82f591ded208a880f0d214aea3c39cc6241add8bfffbcb3abe07311214cb47ff0daec20f1e7ea4ad5a92b131c8

data/Dockerfile

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

data/bin/invoice_printer

@@ -18,7 +18,7 @@ def show_help
 
       -d, --document   document as JSON
         -l, --labels   labels as JSON
-              --font   path to font
+              --font   path to font or builtin font name
          -s, --stamp   path to stamp
               --logo   path to logotype
         --background   path to background image

data/docs/COMMAND_LINE.md

@@ -12,7 +12,7 @@ Options:
 
   -d, --document   document as JSON
     -l, --labels   labels as JSON
-          --font   path to font
+          --font   path to font or builtin font name
      -s, --stamp   path to stamp
           --logo   path to logotype
     --background   path to background image

data/docs/INSTALLATION.md

@@ -12,6 +12,10 @@ Or the server version as:
 
     $ gem install invoice_printer_server
 
+To have builtin fonts available install:
+
+    $ gem install invoice_printer_fonts
+
 ### With Bundler
 
 Add this line to your application's Gemfile:
@@ -26,6 +30,12 @@ For the server:
 gem 'invoice_printer_server'
 ```
 
+To have builtin fonts available add:
+
+```ruby
+gem 'invoice_printer_fonts'
+```
+
 And then execute:
 
     $ bundle

data/docs/LIBRARY.md

@@ -233,9 +233,9 @@ InvoicePrinter.print(
 )
 ```
 
-If you don't have a font around, you can install `dejavu-fonts` gem and specify "dejavu" as the font path.
+If you don't have a font around, you can install `invoice_printer_fonts` gem and specify the supported font name instead.
 
-We recommend you DejaVuSans and Overpass fonts.
+Supported builtin fonts are: `overpass`, `opensans`, and `ruboto`. Note that searching the path takes preference.
 
 ### Background
 

data/docs/SERVER.md

@@ -28,6 +28,8 @@ $ sudo docker run -d -p 9393:9393 -t docker.io/strzibnyj/invoice_printer_server
 ```
 The server will then be available on `0.0.0.0:9393`.
 
+Docker image already contains the optional `invoice_printer_fonts` gem.
+
 ### As a mountable Rack app
 
 If you want you can always run the server from your custom program or mount it directly from a Rack app.
@@ -56,7 +58,7 @@ Options:
 
 - `document` - JSON representation of the document
 - `labels` - JSON for labels
-- `font` - path to font file
+- `font` - path to font file or builtin font name
 - `stamp` - path to stamp file
 - `logo` - path to logotype file
 - `background` - path to background file
@@ -96,7 +98,7 @@ Options:
 
 - `document` - JSON representation of the document
 - `labels` - JSON for labels
-- `font` - path to font file
+- `font` - path to font file or builtin font name
 - `stamp` - path to stamp file
 - `logo` - path to logotype file
 - `background` - path to background file

data/examples/czech_invoice.rb

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 # This is an example of a Czech invoice.
-#
-# Due to the special characters it requires Overpass-Regular.ttf font to be
-# present in this directory.
 
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -81,7 +78,7 @@ invoice = InvoicePrinter::Document.new(
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  font: File.expand_path('../Overpass-Regular.ttf', __FILE__),
+  font: 'overpass',
   logo: 'prawn.png',
   file_name: 'czech_invoice.pdf'
 )
@@ -89,7 +86,7 @@ InvoicePrinter.print(
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  font: File.expand_path('../Overpass-Regular.ttf', __FILE__),
+  font: 'overpass',
   logo: 'prawn.png',
   file_name: 'czech_invoice_a4.pdf',
   page_size: :a4

data/examples/czech_invoice_long.rb

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 # This is an example of a Czech invoice.
-#
-# Due to the special characters it requires Overpass-Regular.ttf font to be
-# present in this directory.
 
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -81,7 +78,7 @@ invoice = InvoicePrinter::Document.new(
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  font: File.expand_path('../Overpass-Regular.ttf', __FILE__),
+  font: 'overpass',
   logo: 'prawn.png',
   file_name: 'czech_invoice_long.pdf'
 )
@@ -89,7 +86,7 @@ InvoicePrinter.print(
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  font: File.expand_path('../Overpass-Regular.ttf', __FILE__),
+  font: 'overpass',
   logo: 'prawn.png',
   file_name: 'czech_invoice_long_a4.pdf',
   page_size: :a4

data/examples/international_invoice.rb

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 # This is an example of a international invoice with Czech labels and English translation.
-#
-# Due to the special characters it requires Overpass-Regular.ttf font to be
-# present in this directory.
 
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -82,7 +79,7 @@ invoice = InvoicePrinter::Document.new(
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  font: File.expand_path('../Overpass-Regular.ttf', __FILE__),
+  font: 'overpass',
   logo: 'prawn.png',
   file_name: 'international_invoice.pdf'
 )
@@ -90,7 +87,7 @@ InvoicePrinter.print(
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  font: File.expand_path('../Overpass-Regular.ttf', __FILE__),
+  font: 'overpass',
   logo: 'prawn.png',
   file_name: 'international_invoice_a4.pdf',
   page_size: :a4

data/examples/promo.rb

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 # This is an example of a international invoice with Czech labels and English translation.
-#
-# Due to the special characters it requires Overpass-Regular.ttf font to be
-# present in this directory.
 
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -78,7 +75,7 @@ invoice = InvoicePrinter::Document.new(
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  font: File.expand_path('../Overpass-Regular.ttf', __FILE__),
+  font: File.expand_path('../../../assets/fonts/overpass/Overpass-Regular.ttf', __FILE__),
   logo: 'logo.png',
   file_name: 'promo.pdf'
 )
@@ -86,7 +83,7 @@ InvoicePrinter.print(
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  font: File.expand_path('../Overpass-Regular.ttf', __FILE__),
+  font: File.expand_path('../../../assets/fonts/overpass/Overpass-Regular.ttf', __FILE__),
   logo: 'logo.png',
   file_name: 'promo_a4.pdf',
   page_size: :a4

data/examples/provider_purchaser_lines.rb

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 # This is an example of a Czech invoice.
-#
-# Due to the special characters it requires Overpass-Regular.ttf font to be
-# present in this directory.
 
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -96,7 +93,7 @@ invoice = InvoicePrinter::Document.new(
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  font: File.expand_path('../Overpass-Regular.ttf', __FILE__),
+  font: 'overpass',
   logo: 'prawn.png',
   file_name: 'provider_purchaser_lines.pdf'
 )
@@ -104,7 +101,7 @@ InvoicePrinter.print(
 InvoicePrinter.print(
   document: invoice,
   labels: labels,
-  font: File.expand_path('../Overpass-Regular.ttf', __FILE__),
+  font: 'overpass',
   logo: 'prawn.png',
   file_name: 'provider_purchaser_lines_a4.pdf',
   page_size: :a4

data/invoice_printer.gemspec

@@ -2,11 +2,22 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'invoice_printer/version'
 
-SERVER_FILES = [
+ONLY_SERVER_FILES = [
   'bin/invoice_printer_server',
   'lib/invoice_printer/server.rb'
 ]
 
+ONLY_FONTS_FILES = [
+  'FONTS_LICENSE.txt',
+  'assets/fonts/overpass/OFL-1.1.txt',
+  'assets/fonts/overpass/Overpass-Regular.ttf',
+  'assets/fonts/opensans/Apache-2.0.txt',
+  'assets/fonts/opensans/OpenSans-Regular.ttf',
+  'assets/fonts/roboto/Apache-2.0.txt',
+  'assets/fonts/roboto/Roboto-Regular.ttf',
+  'lib/invoice_printer/fonts.rb'
+]
+
 Gem::Specification.new do |spec|
   spec.name          = 'invoice_printer'
   spec.version       = InvoicePrinter::VERSION
@@ -20,7 +31,8 @@ Gem::Specification.new do |spec|
   # Remove server files
   # Remove .pdf files as they take a lot of space
   package_files = `git ls-files -z`.split("\x0")
-                    .reject{ |file| SERVER_FILES.include?(file) }
+                    .reject{ |file| ONLY_SERVER_FILES.include?(file) }
+                    .reject{ |file| ONLY_FONTS_FILES.include?(file) }
                     .reject{ |file| file.match /.*\.pdf/ }
 
   spec.files         = package_files

data/invoice_printer_fonts.gemspec

@@ -0,0 +1,39 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'invoice_printer/version'
+
+FONTS_FILES = [
+  'LICENSE.txt',
+  'FONTS_LICENSE.txt',
+  'assets/fonts/overpass/OFL-1.1.txt',
+  'assets/fonts/overpass/Overpass-Regular.ttf',
+  'assets/fonts/opensans/Apache-2.0.txt',
+  'assets/fonts/opensans/OpenSans-Regular.ttf',
+  'assets/fonts/roboto/Apache-2.0.txt',
+  'assets/fonts/roboto/Roboto-Regular.ttf',
+  'lib/invoice_printer/fonts.rb'
+]
+
+Gem::Specification.new do |spec|
+  spec.name          = 'invoice_printer_fonts'
+  spec.version       = InvoicePrinter::VERSION
+  spec.authors       = ['Josef Strzibny']
+  spec.email         = ['strzibny@strzibny.name']
+  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'
+
+  # Include only font files
+  spec.files         = FONTS_FILES
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib']
+
+  spec.required_ruby_version = '>= 2.4'
+
+  spec.add_dependency 'invoice_printer', InvoicePrinter::VERSION
+
+  spec.add_development_dependency 'bundler', '>= 1.7'
+  spec.add_development_dependency 'rake', '>= 10.0'
+end

data/invoice_printer_server.gemspec

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'invoice_printer/version'
 
 SERVER_FILES = [
+  'LICENSE.txt',
   'bin/invoice_printer_server',
   'lib/invoice_printer/server.rb',
   'lib/invoice_printer/version.rb'

data/lib/invoice_printer/pdf_document.rb

@@ -145,28 +145,20 @@ module InvoicePrinter
     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}"
+        set_builtin_font(@font)
       end
     end
 
-    # DejaVu from dejavu-fonts gem
-    def set_dejavu_font
-      require 'dejavu-fonts'
-      font_name = 'dejavu'
+    def set_builtin_font(font)
+      require 'invoice_printer/fonts'
 
       @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]
-        }
+        "#{font}" => InvoicePrinter::Fonts.paths_for(font)
       )
-      @pdf.font(font_name)
-    rescue
+      @pdf.font(font)
+
+    rescue StandardError
       raise FontFileNotFound, "Font file not found for #{font}"
     end
 

data/lib/invoice_printer/version.rb

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

data/test/examples_test.rb

@@ -11,7 +11,7 @@ class ExamplesTest < Minitest::Test
   end
 
   def teardown
-    FileUtils.rm_rf @test_dir if File.exists?(@test_dir)
+    FileUtils.rm_rf @test_dir if File.exist?(@test_dir)
   end
 
   # 1, copy example to the test directory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: invoice_printer
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Josef Strzibny
@@ -117,6 +117,7 @@ files:
 - examples/simple_invoice.rb
 - examples/stamp.png
 - invoice_printer.gemspec
+- invoice_printer_fonts.gemspec
 - invoice_printer_server.gemspec
 - lib/invoice_printer.rb
 - lib/invoice_printer/document.rb