webtranslateit-payday 1.7.3 → 2.0.0

data/lib/payday.rb

@@ -8,14 +8,14 @@ loader.setup
 require 'active_support/core_ext/object/blank' # For Object#blank? method
 require 'bigdecimal'
 require 'date'
+require 'json'
 require 'money'
-require 'prawn'
-require 'prawn/table'
-require 'prawn-svg'
+require 'typst'
 require 'time'
 
-# Load translations from the locale folder
-I18n.load_path.concat(Dir[File.join('config', 'locales', '*.yml')])
+# Load our own translations. This has to resolve against the gem rather than the working
+# directory, or the locales only load when the process happens to be running from the gem root.
+I18n.load_path.concat(Dir[File.expand_path('../config/locales/*.yml', __dir__)])
 
 module Payday
 end

data/payday.gemspec

@@ -2,26 +2,29 @@
 
 Gem::Specification.new do |s|
   s.name        = 'webtranslateit-payday'
-  s.version     = '1.7.3'
-  s.required_ruby_version = '>= 3.1'
+  s.version     = '2.0.0'
+  s.required_ruby_version = '>= 3.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Alan Johnson', 'Edouard Briere']
   s.email       = ['edouard@webtranslateit.com']
   s.homepage    = 'https://github.com/webtranslateit/payday'
   s.summary     = 'A simple library for rendering invoices.'
-  s.description = 'Payday is a library for rendering invoices to pdf.'
+  s.description = 'Payday is a library for rendering invoices to pdf, using Typst.'
   s.license = 'MIT'
 
   s.add_dependency 'activesupport', '>= 7', '< 9'
   s.add_dependency 'i18n', '~> 1.12', '< 2'
   s.add_dependency 'money', '>= 6.16', '< 8.0'
-  s.add_dependency 'prawn', '~> 2.4', '< 3'
-  s.add_dependency 'prawn-svg', '~> 0.32', '< 1'
-  s.add_dependency 'prawn-table', '~> 0.2', '< 1'
   s.add_dependency 'rqrcode', '>= 2', '< 4'
+  s.add_dependency 'typst', '~> 0.15'
   s.add_dependency 'zeitwerk', '~> 2.6', '< 3'
 
-  s.files = `git ls-files`.split("\n")
+  # Only what the gem needs at run time, plus the docs. The spec suite carries several
+  # hundred kilobytes of reference PDFs that nobody installing this wants.
+  root_files = %w[README.md CHANGELOG.md payday.gemspec].freeze
+  s.files = `git ls-files -z`.split("\x0").select do |path|
+    path.start_with?('lib/', 'config/locales/', 'fonts/') || root_files.include?(path)
+  end
   s.require_paths = ['lib']
   s.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webtranslateit-payday
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Alan Johnson
@@ -71,85 +71,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '8.0'
 - !ruby/object:Gem::Dependency
-  name: prawn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: prawn-svg
+  name: rqrcode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: prawn-table
+  name: typst
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: rqrcode
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -170,27 +124,15 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-description: Payday is a library for rendering invoices to pdf.
+description: Payday is a library for rendering invoices to pdf, using Typst.
 email:
 - edouard@webtranslateit.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitattributes"
-- ".github/dependabot.yml"
-- ".github/release-drafter.yml"
-- ".github/workflows/ci.yml"
-- ".github/workflows/release-drafter.yml"
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
-- Guardfile
 - README.md
-- Rakefile
 - config/locales/payday.de.yml
 - config/locales/payday.en.yml
 - config/locales/payday.es.yml
@@ -205,25 +147,18 @@ files:
 - lib/generators/payday/setup/templates/line_item.rb
 - lib/generators/payday/setup/templates/migration.rb
 - lib/payday.rb
+- lib/payday/assets/default_logo.png
 - lib/payday/config.rb
 - lib/payday/invoice.rb
+- lib/payday/invoice_presenter.rb
 - lib/payday/invoiceable.rb
 - lib/payday/line_item.rb
 - lib/payday/line_itemable.rb
+- lib/payday/markup.rb
 - lib/payday/pdf_renderer.rb
+- lib/payday/qr_code.rb
+- lib/payday/templates/invoice.typ
 - payday.gemspec
-- spec/assets/default_logo.png
-- spec/assets/example_invoice_with_qr.pdf
-- spec/assets/svg.pdf
-- spec/assets/testing.pdf
-- spec/assets/testing_es.pdf
-- spec/assets/testing_predefined_amount.pdf
-- spec/assets/tiger.svg
-- spec/invoice_spec.rb
-- spec/line_item_spec.rb
-- spec/pdf_renderer_spec.rb
-- spec/spec_helper.rb
-- spec/support/asset_matchers.rb
 homepage: https://github.com/webtranslateit/payday
 licenses:
 - MIT
@@ -236,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.gitattributes

@@ -1 +0,0 @@
-*.pdf binary

data/.github/dependabot.yml

@@ -1,28 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "bundler" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "weekly"
-      day: "monday"
-      time: "04:00"
-    reviewers:
-    - edouard
-    assignees:
-    - edouard
-
-  - package-ecosystem: github-actions
-    directory: "/"
-    schedule:
-      interval: weekly
-      day: monday
-      time: "04:00"
-    reviewers:
-    - edouard
-    assignees:
-    - edouard

data/.github/release-drafter.yml

@@ -1,36 +0,0 @@
-name-template: '$RESOLVED_VERSION 🌈'
-tag-template: '$RESOLVED_VERSION'
-categories:
-  - title: '🚀 Features'
-    labels:
-      - 'feature'
-      - 'enhancement'
-  - title: '🐛 Bug Fixes'
-    labels:
-      - 'bug'
-      - 'design'
-      - 'performance'
-  - title: '🧰 Maintenance'
-    labels:
-      - 'admin'
-      - 'refactoring'
-      - 'dependencies'
-      - 'github_actions'
-      - 'tests'
-change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
-change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
-version-resolver:
-  major:
-    labels:
-      - 'major'
-  minor:
-    labels:
-      - 'minor'
-  patch:
-    labels:
-      - 'patch'
-  default: patch
-template: |
-  ## Changes
-
-  $CHANGES

data/.github/workflows/ci.yml

@@ -1,47 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on: push
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: ['3.2', '3.3', '3.4']
-
-    steps:
-    - uses: actions/checkout@v6
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run tests
-      run: bundle exec rspec
-
-  linters:
-    name: Linters
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Install ruby and gems
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.3.6 # Use .ruby-version file instead of duplicating here and in Gemfile?
-          bundler-cache: true
-
-      - name: Run ruby linter
-        run: bundle exec rubocop --format github

data/.github/workflows/release-drafter.yml

@@ -1,29 +0,0 @@
-name: Release Drafter
-
-on:
-  push:
-    # branches to consider in the event; optional, defaults to all
-    branches:
-      - main
-  # pull_request event is required only for autolabeler
-  pull_request:
-    # Only following types are handled by the action, but one can default to all as well
-    types: [opened, reopened, synchronize]
-
-jobs:
-  update_release_draft:
-    runs-on: ubuntu-latest
-    steps:
-      # (Optional) GitHub Enterprise requires GHE_HOST variable set
-      #- name: Set GHE_HOST
-      #  run: |
-      #    echo "GHE_HOST=${GITHUB_SERVER_URL##https:\/\/}" >> $GITHUB_ENV
-
-      # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v6
-        # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
-        # with:
-        #   config-name: my-config.yml
-        #   disable-autolabeler: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.gitignore

@@ -1,8 +0,0 @@
-tmp/
-doc/
-.yardoc/
-*.gem
-.bundle
-pkg/*
-bin/
-.rubocop-http*

data/.rubocop.yml

@@ -1,16 +0,0 @@
-plugins:
-  - rubocop-performance
-  - rubocop-rspec
-
-inherit_from:
-  - https://raw.githubusercontent.com/webtranslateit/webtranslateit/main/.rubocop_common.yml
-  - .rubocop_todo.yml
-
-AllCops:
-  TargetRubyVersion: 3.1
-  Exclude:
-    - lib/generators/**/*
-
-inherit_mode:
-   merge:
-     - Exclude

data/Gemfile

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'guard'
-gem 'guard-rspec'
-gem 'guard-rubocop'
-gem 'matrix'
-gem 'rspec', '~> 3.13.2'
-gem 'rubocop'
-gem 'rubocop-performance'
-gem 'rubocop-rspec'

data/Gemfile.lock

@@ -1,191 +0,0 @@
-PATH
-  remote: .
-  specs:
-    webtranslateit-payday (1.7.3)
-      activesupport (>= 7, < 9)
-      i18n (~> 1.12, < 2)
-      money (>= 6.16, < 8.0)
-      prawn (~> 2.4, < 3)
-      prawn-svg (~> 0.32, < 1)
-      prawn-table (~> 0.2, < 1)
-      rqrcode (>= 2, < 4)
-      zeitwerk (~> 2.6, < 3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (7.2.3)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.3)
-    base64 (0.3.0)
-    benchmark (0.5.0)
-    bigdecimal (3.3.1)
-    chunky_png (1.4.0)
-    coderay (1.1.3)
-    concurrent-ruby (1.3.6)
-    connection_pool (2.5.4)
-    css_parser (1.21.1)
-      addressable
-    diff-lcs (1.6.2)
-    drb (2.2.3)
-    ffi (1.17.3-arm64-darwin)
-    ffi (1.17.3-x86_64-darwin)
-    ffi (1.17.3-x86_64-linux-gnu)
-    formatador (1.2.3)
-      reline
-    guard (2.20.1)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      logger (~> 1.6)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.13.0)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.5.0)
-      guard (~> 2.0)
-      rubocop (< 2.0)
-    i18n (1.14.8)
-      concurrent-ruby (~> 1.0)
-    io-console (0.8.2)
-    json (2.18.1)
-    language_server-protocol (3.17.0.5)
-    lint_roller (1.1.0)
-    listen (3.10.0)
-      logger
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.7.0)
-    lumberjack (1.4.2)
-    matrix (0.4.3)
-    method_source (1.1.0)
-    minitest (5.26.0)
-    money (7.0.2)
-      bigdecimal
-      i18n (~> 1.9)
-    nenv (0.3.0)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    parallel (1.27.0)
-    parser (3.3.10.1)
-      ast (~> 2.4.1)
-      racc
-    pdf-core (0.10.0)
-    prawn (2.5.0)
-      matrix (~> 0.4)
-      pdf-core (~> 0.10.0)
-      ttfunk (~> 1.8)
-    prawn-svg (0.38.1)
-      css_parser (~> 1.6)
-      matrix (~> 0.4.2)
-      prawn (>= 0.11.1, < 3)
-      rexml (>= 3.4.2, < 4)
-    prawn-table (0.2.2)
-      prawn (>= 1.3.0, < 3.0.0)
-    prism (1.9.0)
-    pry (0.16.0)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-      reline (>= 0.6.0)
-    public_suffix (6.0.2)
-    racc (1.8.1)
-    rainbow (3.1.1)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
-      ffi (~> 1.0)
-    regexp_parser (2.11.3)
-    reline (0.6.3)
-      io-console (~> 0.5)
-    rexml (3.4.4)
-    rqrcode (3.1.1)
-      chunky_png (~> 1.0)
-      rqrcode_core (~> 2.0)
-    rqrcode_core (2.0.1)
-    rspec (3.13.2)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.6)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.6)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.6)
-    rubocop (1.84.2)
-      json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
-      parser (>= 3.3.0.2)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.49.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
-      parser (>= 3.3.7.2)
-      prism (~> 1.7)
-    rubocop-performance (1.26.1)
-      lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rspec (3.9.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.81)
-    ruby-progressbar (1.13.0)
-    securerandom (0.4.1)
-    shellany (0.0.1)
-    thor (1.5.0)
-    ttfunk (1.8.0)
-      bigdecimal (~> 3.1)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (3.2.0)
-      unicode-emoji (~> 4.1)
-    unicode-emoji (4.2.0)
-    zeitwerk (2.7.1)
-
-PLATFORMS
-  arm64-darwin-21
-  arm64-darwin-22
-  arm64-darwin-23
-  arm64-darwin-24
-  arm64-darwin-25
-  x86_64-darwin-21
-  x86_64-linux
-
-DEPENDENCIES
-  guard
-  guard-rspec
-  guard-rubocop
-  matrix
-  rspec (~> 3.13.2)
-  rubocop
-  rubocop-performance
-  rubocop-rspec
-  webtranslateit-payday!
-
-BUNDLED WITH
-   2.6.2

data/Guardfile

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-guard :rspec, cmd: 'bundle exec rspec --color --format progress' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch('spec/spec_helper.rb')                        { 'spec' }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-end
-
-guard :rubocop do
-  watch(/.+\.rb$/)
-  watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }
-end

data/Rakefile

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler'
-
-require 'rake'
-require 'rake/testtask'
-
-task default: :test
-
-Bundler::GemHelper.install_tasks
-
-Rake::TestTask.new do |t|
-  t.test_files = FileList['test/**/*_test.rb']
-end