prawn-swiss_qr_bill 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faa2f8fb8c38ea2681890f7573bb42ab424cadb413d57699e0e64145088c8911
-  data.tar.gz: 2fa0db096bc0d9fb4060858dd0fe88ba187c20a54ae36babcb66848c6a102a33
+  metadata.gz: 427079ece5871b80503cf648e5f855d3ff1a0862e120fcf7ce9b125f641aaf0b
+  data.tar.gz: f0a5e3e4e28ce8ef24b4888e56d06bf48ed0c98a23890c5b642195a6a92a275f
 SHA512:
-  metadata.gz: e1d30550f53e1ed3dc74a0256d826a25fa2290f06a9b4e282e8529dabeaf334907b87613e6babd52667ee3cf248098464dd9381743e4883014a7a85c8783c97d
-  data.tar.gz: 536068e41ad5d54e70dcebe9deeeb19a1984eb52b4bee5e020e5644bbdcf4e7c66453b449ae3e811b523f37dc2b3fc1a2dcaacd51c072562a1628b0b3ef509ea
+  metadata.gz: 7f1bf0ea06f6a9cf152763d0cf0f721efd403b066fd27bba3a4dde2635e72a2426708f799daa45f46eff49027435211f6b916ce08acba407786e186580b205a9
+  data.tar.gz: 7408f2208b8c129392ce77233c32666eb283a39cd86af927aa66c12e79cd093d06147c64de30bba81b1f6e5ebaad5abee88556fd29b6d4f548cfa01f81a62a45

data/README.md

@@ -3,6 +3,11 @@
 A Ruby library for creating Swiss QR-bill payment slips inside a PDF. It is
 built as a [Prawn](https://github.com/prawnpdf/prawn) extension.
 
+
+[![Gem](https://img.shields.io/gem/v/prawn-swiss_qr_bill?color=green&label=gem%20version)](https://rubygems.org/gems/prawn-swiss_qr_bill)
+[![Build Status](https://github.com/mitosch/prawn-swiss_qr_bill/workflows/CI/badge.svg)](https://github.com/mitosch/prawn-swiss_qr_bill/actions/workflows/ci.yml)
+[![Test Coverage](https://codecov.io/gh/mitosch/prawn-swiss_qr_bill/graph/badge.svg)](https://codecov.io/gh/mitosch/prawn-swiss_qr_bill)
+
 ## Installation
 
 Add the following line to your `Gemfile`:

data/assets/fonts/inter/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

data/lib/prawn/swiss_qr_bill/bill.rb

@@ -4,17 +4,33 @@ module Prawn
   module SwissQRBill
     # Bill renders the Swiss QR-bill at the bottom of a page
     class Bill
+      FONT_DIR = File.expand_path("#{__dir__}/../../../assets/fonts")
+
       def initialize(document, data)
         @doc = document
         @data = data
       end
 
       def draw
+        set_font
+
         @doc.canvas do
           Sections.draw_all(@doc, @data)
           CuttingLines.new(@doc).draw
         end
       end
+
+      private
+
+      def set_font
+        @doc.font_families.update(
+          'Inter' => {
+            normal: "#{FONT_DIR}/inter/Inter-Regular.ttf",
+            bold: "#{FONT_DIR}/inter/Inter-Bold.ttf"
+          }
+        )
+        @doc.font 'Inter'
+      end
     end
   end
 end

data/lib/prawn/swiss_qr_bill/cutting_lines.rb

@@ -4,7 +4,7 @@ module Prawn
   module SwissQRBill
     # Horizontal and vertical cutting lines with a scissor symbol
     class CuttingLines
-      SCISSOR_FILE = File.expand_path("#{__dir__}/images/scissor.png")
+      SCISSOR_FILE = File.expand_path("#{__dir__}/../../../assets/images/scissor.png")
 
       SCISSOR_WIDTH = 5.mm
       SCISSOR_HEIGHT = 3.mm
@@ -17,7 +17,7 @@ module Prawn
       def initialize(document)
         @doc = document
 
-        @brain = {}
+        @brain = { border: { color: nil, width: nil } }
 
         load_specs
       end
@@ -40,8 +40,10 @@ module Prawn
       end
 
       def set_styles
-        @brain[:line_width] = doc.line_width
+        @brain[:border][:width] = doc.line_width
+        @brain[:border][:color] = doc.stroke_color
 
+        doc.stroke_color '000000'
         doc.line_width 0.5
         doc.dash 2, space: 2
       end
@@ -66,7 +68,8 @@ module Prawn
       end
 
       def reset_styles
-        doc.line_width = @brain[:line_width]
+        doc.line_width = @brain[:border][:width]
+        doc.stroke_color = @brain[:border][:color]
         doc.undash
       end
     end

data/lib/prawn/swiss_qr_bill/sections/payment_amount.rb

@@ -18,7 +18,7 @@ module Prawn
         AMOUNT_WIDTH = 29.mm
 
         # height of the amount label when corner-box has to be displayed
-        AMOUNT_LABEL_HEIGHT = 3.5.mm
+        AMOUNT_LABEL_HEIGHT = 4.mm
 
         # measurement of amount corner-box
         AMOUNT_BOX_WIDTH = 40.mm

data/lib/prawn/swiss_qr_bill/sections/qr_code.rb

@@ -18,7 +18,7 @@ module Prawn
 
         QR_PX_SIZE = 1160
 
-        SWISS_CROSS_FILE = File.expand_path("#{__dir__}/../images/swiss_cross.png")
+        SWISS_CROSS_FILE = File.expand_path("#{__dir__}/../../../../assets/images/swiss_cross.png")
 
         MAPPING = {
           creditor_address_type: %i[creditor address type],

data/lib/prawn/swiss_qr_bill/version.rb

@@ -2,6 +2,6 @@
 
 module Prawn
   module SwissQRBill
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

data/prawn-swiss_qr_bill.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir['lib/**/**/*.rb',
                    'lib/prawn/swiss_qr_bill/specs.yml',
-                   'lib/prawn/swiss_qr_bill/images/*.png',
+                   'assets/images/*', 'assets/fonts/inter/*',
                    'config/locales/*.yml',
                    'prawn-swiss_qr_bill.gemspec',
                    'Gemfile', 'README.md', 'CHANGELOG.mg'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-swiss_qr_bill
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Mischa Schindowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-18 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -159,6 +159,11 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - README.md
+- assets/fonts/inter/Inter-Bold.ttf
+- assets/fonts/inter/Inter-Regular.ttf
+- assets/fonts/inter/OFL.txt
+- assets/images/scissor.png
+- assets/images/swiss_cross.png
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/fr.yml
@@ -172,8 +177,6 @@ files:
 - lib/prawn/swiss_qr_bill/helpers/box_helper.rb
 - lib/prawn/swiss_qr_bill/helpers/number_helper.rb
 - lib/prawn/swiss_qr_bill/iban.rb
-- lib/prawn/swiss_qr_bill/images/scissor.png
-- lib/prawn/swiss_qr_bill/images/swiss_cross.png
 - lib/prawn/swiss_qr_bill/padded_box.rb
 - lib/prawn/swiss_qr_bill/qr/data.rb
 - lib/prawn/swiss_qr_bill/sections.rb