webtranslateit-payday 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 842bfa9c7b5cf094139d3a5076498d4c947c5701ba7e28a0e227bbb459d084c6
-  data.tar.gz: 1bac34a2bd9e729397f3492e56e9649101efdcf126fe687482980210cdce715c
+  metadata.gz: bb7eb8b193dfb36f037b5c9cb428229579da578a6f645edbb25730899d20701d
+  data.tar.gz: 1812ebfd3a8c05fde6dd07a5626d715d614a3a63167ec7c89662c7c9d81770e5
 SHA512:
-  metadata.gz: 0d3ccddb211b49394f2402125264fdbf914558320d4359ca898729eae6b2cebd67c6fd7f7bd41592e54979361443238a773710ccb76d7bbfd58beddf310eb0cb
-  data.tar.gz: c128c0239f0566faecd6bd63a95b300839824766cf31e8928bf2823c932ada8b0ac4f3e001adcee118be46699beac44dbb1683a7471da11a682314d3efd22528
+  metadata.gz: e0af2856aca3b1451e98ad8f6f5bd1c8bd5b58e72d3189e058e2b732e0a10202caed2219c7f5720527b79bf74c59e4ce98de0b18c27264b951a7f12161896805
+  data.tar.gz: d2386981f2a425f306b1c5211e9da53e1ad5d16327f14bc32f73d93bda1c2aa9a34cbfc87653e892f8490632f10cef12098d850e2c6796f7514e35c3cba775e3

data/.github/dependabot.yml

@@ -8,4 +8,6 @@ updates:
   - package-ecosystem: "bundler" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "daily"
+      interval: "weekly"
+      day: "monday"
+      time: "04:00"

data/.github/release-drafter.yml

@@ -0,0 +1,36 @@
+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/release-drafter.yml

@@ -0,0 +1,29 @@
+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@v5
+        # (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

@@ -2,7 +2,7 @@ tmp/
 doc/
 .yardoc/
 *.gem
-Gemfile.lock
 .bundle
 pkg/*
 bin/
+.rubocop-http*

data/.rubocop.yml

@@ -1,4 +1,9 @@
-inherit_from: .rubocop_todo.yml
+require:
+  - rubocop-rspec
+
+inherit_from:
+  - https://raw.githubusercontent.com/webtranslateit/webtranslateit/main/.rubocop_common.yml
+  - .rubocop_todo.yml
 
 AllCops:
   TargetRubyVersion: 3.1
@@ -6,152 +11,5 @@ AllCops:
     - lib/generators/**/*
 
 inherit_mode:
-  merge:
-    - Exclude
-
-require: rubocop-rspec
-
-Gemspec/DeprecatedAttributeAssignment: # new in 1.30
-  Enabled: true
-Gemspec/RequireMFA: # new in 1.23
-  Enabled: true
-Layout/LineEndStringConcatenationIndentation: # new in 1.18
-  Enabled: true
-Layout/SpaceBeforeBrackets: # new in 1.7
-  Enabled: true
-Lint/AmbiguousAssignment: # new in 1.7
-  Enabled: true
-Lint/AmbiguousOperatorPrecedence: # new in 1.21
-  Enabled: true
-Lint/AmbiguousRange: # new in 1.19
-  Enabled: true
-Lint/DeprecatedConstants: # new in 1.8
-  Enabled: true
-Lint/DuplicateBranch: # new in 1.3
-  Enabled: true
-Lint/DuplicateRegexpCharacterClassElement: # new in 1.1
-  Enabled: true
-Lint/EmptyBlock: # new in 1.1
-  Enabled: true
-Lint/EmptyClass: # new in 1.3
-  Enabled: true
-Lint/EmptyInPattern: # new in 1.16
-  Enabled: true
-Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
-  Enabled: true
-Lint/LambdaWithoutLiteralBlock: # new in 1.8
-  Enabled: true
-Lint/NoReturnInBeginEndBlocks: # new in 1.2
-  Enabled: true
-Lint/NumberedParameterAssignment: # new in 1.9
-  Enabled: true
-Lint/OrAssignmentToConstant: # new in 1.9
-  Enabled: true
-Lint/RedundantDirGlobSort: # new in 1.8
-  Enabled: true
-Lint/RefinementImportMethods: # new in 1.27
-  Enabled: true
-Lint/RequireRelativeSelfPath: # new in 1.22
-  Enabled: true
-Lint/SymbolConversion: # new in 1.9
-  Enabled: true
-Lint/ToEnumArguments: # new in 1.1
-  Enabled: true
-Lint/TripleQuotes: # new in 1.9
-  Enabled: true
-Lint/UnexpectedBlockArity: # new in 1.5
-  Enabled: true
-Lint/UnmodifiedReduceAccumulator: # new in 1.1
-  Enabled: true
-Lint/UselessRuby2Keywords: # new in 1.23
-  Enabled: true
-Naming/BlockForwarding: # new in 1.24
-  Enabled: true
-Security/CompoundHash: # new in 1.28
-  Enabled: true
-Security/IoMethods: # new in 1.22
-  Enabled: true
-Style/ArgumentsForwarding: # new in 1.1
-  Enabled: true
-Style/CollectionCompact: # new in 1.2
-  Enabled: true
-Style/DocumentDynamicEvalDefinition: # new in 1.1
-  Enabled: true
-Style/EndlessMethod: # new in 1.8
-  Enabled: true
-Style/EnvHome: # new in 1.29
-  Enabled: true
-Style/FetchEnvVar: # new in 1.28
-  Enabled: true
-Style/FileRead: # new in 1.24
-  Enabled: true
-Style/FileWrite: # new in 1.24
-  Enabled: true
-Style/HashConversion: # new in 1.10
-  Enabled: true
-Style/HashExcept: # new in 1.7
-  Enabled: true
-Style/IfWithBooleanLiteralBranches: # new in 1.9
-  Enabled: true
-Style/InPatternThen: # new in 1.16
-  Enabled: true
-Style/MapCompactWithConditionalBlock: # new in 1.30
-  Enabled: true
-Style/MapToHash: # new in 1.24
-  Enabled: true
-Style/MultilineInPatternThen: # new in 1.16
-  Enabled: true
-Style/NegatedIfElseCondition: # new in 1.2
-  Enabled: true
-Style/NestedFileDirname: # new in 1.26
-  Enabled: true
-Style/NilLambda: # new in 1.3
-  Enabled: true
-Style/NumberedParameters: # new in 1.22
-  Enabled: true
-Style/NumberedParametersLimit: # new in 1.22
-  Enabled: true
-Style/ObjectThen: # new in 1.28
-  Enabled: true
-Style/OpenStructUse: # new in 1.23
-  Enabled: true
-Style/QuotedSymbols: # new in 1.16
-  Enabled: true
-Style/RedundantArgument: # new in 1.4
-  Enabled: true
-Style/RedundantInitialize: # new in 1.27
-  Enabled: true
-Style/RedundantSelfAssignmentBranch: # new in 1.19
-  Enabled: true
-Style/SelectByRegexp: # new in 1.22
-  Enabled: true
-Style/StringChars: # new in 1.12
-  Enabled: true
-Style/SwapValues: # new in 1.1
-  Enabled: true
-RSpec/BeEq: # new in 2.9.0
-  Enabled: true
-RSpec/BeNil: # new in 2.9.0
-  Enabled: true
-RSpec/ChangeByZero: # new in 2.11.0
-  Enabled: true
-RSpec/ExcessiveDocstringSpacing: # new in 2.5
-  Enabled: true
-RSpec/IdenticalEqualityAssertion: # new in 2.4
-  Enabled: true
-RSpec/SubjectDeclaration: # new in 2.5
-  Enabled: true
-RSpec/VerifiedDoubleReference: # new in 2.10.0
-  Enabled: true
-RSpec/FactoryBot/SyntaxMethods: # new in 2.7
-  Enabled: true
-RSpec/Rails/AvoidSetupHook: # new in 2.4
-  Enabled: true
-Layout/LineContinuationLeadingSpace: # new in 1.31
-  Enabled: true
-Layout/LineContinuationSpacing: # new in 1.31
-  Enabled: true
-Lint/ConstantOverwrittenInRescue: # new in 1.31
-  Enabled: true
-Lint/NonAtomicFileOperation: # new in 1.31
-  Enabled: true
+   merge:
+     - Exclude

data/.rubocop_todo.yml

@@ -13,10 +13,3 @@ Style/Documentation:
     - 'spec/**/*'
     - 'test/**/*'
     - 'lib/generators/payday/setup/setup_generator.rb'
-
-# Offense count: 19
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 1.6.0 (2002-08-16)
+
+* Set up release-drafter.
+* Don’t leave gemspec dependencies open ended.
+* Move development dependencies to Gemfile and add Gemfile.lock to version control so dependabot can update them.
+* Inherit rubocop styles from our defaults and fix offences.
+* Load gem’s files using Zeitwerk.
+
+## 1.5.0 (2002-08-09)
+
+* Rubocop offences fixes.
+
 ## 1.4.0 (2022-06-29)
 
 * Target ruby 3.1.

data/Gemfile

@@ -1,3 +1,13 @@
-source 'http://rubygems.org'
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 gemspec
+
+gem 'guard'
+gem 'guard-rspec'
+gem 'guard-rubocop'
+gem 'matrix'
+gem 'rspec', '~> 3.11.0'
+gem 'rubocop'
+gem 'rubocop-rspec'

data/Gemfile.lock

@@ -0,0 +1,139 @@
+PATH
+  remote: .
+  specs:
+    webtranslateit-payday (1.6.0)
+      activesupport (~> 7, < 8)
+      i18n (~> 1.12, < 2)
+      money (~> 6.16, < 7)
+      prawn (~> 2.4, < 3)
+      prawn-svg (~> 0.32, < 1)
+      prawn-table (~> 0.2, < 1)
+      zeitwerk (~> 2.6, < 3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    css_parser (1.11.0)
+      addressable
+    diff-lcs (1.5.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    guard (2.18.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      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.12.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.2)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    matrix (0.4.2)
+    method_source (1.0.0)
+    minitest (5.16.2)
+    money (6.16.0)
+      i18n (>= 0.6.4, <= 2)
+    nenv (0.3.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    pdf-core (0.9.0)
+    prawn (2.4.0)
+      pdf-core (~> 0.9.0)
+      ttfunk (~> 1.7)
+    prawn-svg (0.32.0)
+      css_parser (~> 1.6)
+      prawn (>= 0.11.1, < 3)
+      rexml (~> 3.2)
+    prawn-table (0.2.2)
+      prawn (>= 1.3.0, < 3.0.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.7)
+    rainbow (3.1.1)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.35.0)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-rspec (2.12.1)
+      rubocop (~> 1.31)
+    ruby-progressbar (1.11.0)
+    shellany (0.0.1)
+    thor (1.2.1)
+    ttfunk (1.7.0)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.2.0)
+    zeitwerk (2.6.0)
+
+PLATFORMS
+  arm64-darwin-21
+  x86_64-darwin-21
+  x86_64-linux
+
+DEPENDENCIES
+  guard
+  guard-rspec
+  guard-rubocop
+  matrix
+  rspec (~> 3.11.0)
+  rubocop
+  rubocop-rspec
+  webtranslateit-payday!
+
+BUNDLED WITH
+   2.3.12

data/Guardfile

@@ -1,3 +1,5 @@
+# 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' }

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 
 require 'rake'

data/lib/payday/config.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 module Payday
+
   # Configuration for Payday. This is a singleton, so to set the company_name you would call
   # Payday::Config.default.company_name = "Awesome Corp".
   class Config
+
     attr_accessor :invoice_logo, :company_name, :company_details, :date_format, :currency
 
     # Sets the page size to use. See the
@@ -31,5 +35,7 @@ module Payday
     def initialize
       reset
     end
+
   end
+
 end

data/lib/payday/invoice.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module Payday
+
   # Basically just an invoice. Stick a ton of line items in it, add some details, and then render it out!
   class Invoice
+
     include Payday::Invoiceable
 
     attr_accessor :invoice_number, :bill_to, :ship_to, :notes, :line_items, :shipping_description,
@@ -48,5 +52,7 @@ module Payday
     def add_line_item(options = {})
       line_items << Payday::LineItem.new(options)
     end
+
   end
+
 end

data/lib/payday/invoiceable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Include {Payday::Invoiceable} in your Invoice class to make it Payday compatible. Payday
 # expects that a +line_items+ method containing an Enumerable of {Payday::LineItem} compatible
 # elements exists. Those LineItem objects primarily need to include quantity, price, and description methods.
@@ -15,7 +17,9 @@
 # rubocop:enable Layout/LineLength
 # paid dates, and refunded dates, as well as stamps showing if the invoice is paid or due.
 module Payday
-  module Invoiceable # rubocop:todo Style/Documentation
+
+  module Invoiceable
+
     # Who the invoice is being sent to.
     def bill_to
       "Goofy McGoofison\nYour Invoice Doesn't\nHave It's Own BillTo Method"
@@ -83,5 +87,7 @@ module Payday
         block.call(detail[0], detail[1])
       end
     end
+
   end
+
 end

data/lib/payday/line_item.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Payday
+
   # Represents a line item in an invoice.
   #
   # rubocop:todo Layout/LineLength
@@ -7,6 +10,7 @@ module Payday
   # them your invoice math could get pretty messed up. It's recommended that both values be set to +BigDecimal+ values.
   # Otherwise, we'll do our best to convert the set values to a +BigDecimal+.
   class LineItem
+
     include LineItemable
 
     attr_accessor :description, :display_quantity, :display_price
@@ -42,5 +46,7 @@ module Payday
       value = 0 if value.to_s.blank?
       @predefined_amount = BigDecimal(value.to_s)
     end
+
   end
+
 end

data/lib/payday/line_itemable.rb

@@ -1,12 +1,18 @@
+# frozen_string_literal: true
+
 # Include this module into your line item implementation to make sure that Payday stays happy
 # with it, or just make sure that your line item implements the amount method.
 module Payday
-  module LineItemable # rubocop:todo Style/Documentation
+
+  module LineItemable
+
     # Returns the total amount for this {LineItemable}, or +price * quantity+
     def amount
       return predefined_amount if predefined_amount
 
       price * quantity
     end
+
   end
+
 end

data/lib/payday/pdf_renderer.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 module Payday
+
   # The PDF renderer. We use this internally in Payday to render pdfs, but really you should just need to call
   # {{Payday::Invoiceable#render_pdf}} to render pdfs yourself.
   class PdfRenderer # rubocop:todo Metrics/ClassLength
+
     # Renders the given invoice as a pdf on disk
     def self.render_to_file(invoice, path)
       pdf(invoice).render_file(path)
@@ -17,8 +21,8 @@ module Payday
 
       font_dir = File.join(File.dirname(__dir__), '..', 'fonts')
       pdf.font_families.update(
-        'NotoSans' => { normal: File.join(font_dir, 'NotoSans-Regular.ttf'),
-                        bold: File.join(font_dir, 'NotoSans-Bold.ttf') }
+        'NotoSans' => {normal: File.join(font_dir, 'NotoSans-Regular.ttf'),
+                       bold: File.join(font_dir, 'NotoSans-Bold.ttf')}
       )
 
       # set up some default styling
@@ -75,10 +79,10 @@ module Payday
       end
 
       if File.extname(image) == '.svg'
-        logo_info = pdf.svg(File.read(image), at: pdf.bounds.top_left, width:, height:)
+        logo_info = pdf.svg(File.read(image), at: pdf.bounds.top_left, width: width, height: height)
         logo_height = logo_info[:height]
       else
-        logo_info = pdf.image(image, at: pdf.bounds.top_left, width:, height:)
+        logo_info = pdf.image(image, at: pdf.bounds.top_left, width: width, height: height)
         logo_height = logo_info.scaled_height
       end
 
@@ -88,7 +92,7 @@ module Payday
 
       invoice_or_default(invoice, :company_details).lines.each { |line| table_data << [line] }
 
-      table = pdf.make_table(table_data, cell_style: { borders: [], padding: 0 })
+      table = pdf.make_table(table_data, cell_style: {borders: [], padding: 0})
       pdf.bounding_box([pdf.bounds.width - table.width, pdf.bounds.top], width: table.width,
                                                                          height: table.height + 5) do
         table.draw
@@ -100,7 +104,7 @@ module Payday
 
     # rubocop:todo Metrics/MethodLength
     def self.bill_to_ship_to(invoice, pdf) # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
-      bill_to_cell_style = { borders: [], padding: [2, 0] }
+      bill_to_cell_style = {borders: [], padding: [2, 0]}
       bill_to_ship_to_bottom = 0
 
       # render bill to
@@ -136,21 +140,21 @@ module Payday
       # invoice number
       if defined?(invoice.invoice_number) && invoice.invoice_number
         table_data << if invoice.paid?
-                        [bold_cell(pdf, I18n.t('payday.invoice.receipt_no', default: 'Receipt #:')),
-                         bold_cell(pdf, invoice.invoice_number.to_s, align: :right)]
-                      else
-                        [bold_cell(pdf, I18n.t('payday.invoice.invoice_no', default: 'Invoice #:')),
-                         bold_cell(pdf, invoice.invoice_number.to_s, align: :right)]
-                      end
+          [bold_cell(pdf, I18n.t('payday.invoice.receipt_no', default: 'Receipt #:')),
+           bold_cell(pdf, invoice.invoice_number.to_s, align: :right)]
+        else
+          [bold_cell(pdf, I18n.t('payday.invoice.invoice_no', default: 'Invoice #:')),
+           bold_cell(pdf, invoice.invoice_number.to_s, align: :right)]
+        end
       end
 
       # Due on
       if defined?(invoice.due_at) && invoice.due_at
         due_date = if invoice.due_at.is_a?(Date) || invoice.due_at.is_a?(Time)
-                     invoice.due_at.strftime(Payday::Config.default.date_format)
-                   else
-                     invoice.due_at.to_s
-                   end
+          invoice.due_at.strftime(Payday::Config.default.date_format)
+        else
+          invoice.due_at.to_s
+        end
 
         table_data << [bold_cell(pdf, I18n.t('payday.invoice.due_date', default: 'Due Date:')),
                        bold_cell(pdf, due_date, align: :right)]
@@ -159,10 +163,10 @@ module Payday
       # Paid on
       if defined?(invoice.paid_at) && invoice.paid_at
         paid_date = if invoice.paid_at.is_a?(Date) || invoice.due_at.is_a?(Time)
-                      invoice.paid_at.strftime(Payday::Config.default.date_format)
-                    else
-                      invoice.paid_at.to_s
-                    end
+          invoice.paid_at.strftime(Payday::Config.default.date_format)
+        else
+          invoice.paid_at.to_s
+        end
 
         table_data << [bold_cell(pdf, I18n.t('payday.invoice.paid_date', default: 'Paid Date:')),
                        bold_cell(pdf, paid_date, align: :right)]
@@ -176,7 +180,7 @@ module Payday
 
       return unless table_data.length.positive?
 
-      pdf.table(table_data, cell_style: { borders: [], padding: [1, 10, 1, 1] })
+      pdf.table(table_data, cell_style: {borders: [], padding: [1, 10, 1, 1]})
     end
     # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
@@ -193,20 +197,20 @@ module Payday
                      bold_cell(pdf, I18n.t('payday.line_item.amount', default: 'Amount'), align: :center, borders: [])]
       invoice.line_items.each do |line|
         table_data << if line.predefined_amount
-                        [line.description, '', '', number_to_currency(line.predefined_amount, invoice)]
-                      else
-                        [line.description,
-                         (line.display_price || number_to_currency(line.price, invoice)),
-                         (line.display_quantity || BigDecimal(line.quantity.to_s).to_s('F')),
-                         number_to_currency(line.amount, invoice)]
-                      end
+          [line.description, '', '', number_to_currency(line.predefined_amount, invoice)]
+        else
+          [line.description,
+           (line.display_price || number_to_currency(line.price, invoice)),
+           (line.display_quantity || BigDecimal(line.quantity.to_s).to_s('F')),
+           number_to_currency(line.amount, invoice)]
+        end
       end
 
       pdf.move_cursor_to(pdf.cursor - 20)
       pdf.table(table_data, width: pdf.bounds.width, header: true,
-                            cell_style: { border_width: 0.5, border_left_color: 'FFFFFF', border_right_color: 'FFFFFF',
-                                          border_top_color: 'F6F9FC', border_bottom_color: 'BCC6D0', padding: [5, 10],
-                                          inline_format: true },
+                            cell_style: {border_width: 0.5, border_left_color: 'FFFFFF', border_right_color: 'FFFFFF',
+                                         border_top_color: 'F6F9FC', border_bottom_color: 'BCC6D0', padding: [5, 10],
+                                         inline_format: true},
                             row_colors: %w[F6F9FC ffffff]) do
         # left align the number columns
         columns(1..3).rows(1..row_length - 1).style(align: :right)
@@ -227,10 +231,10 @@ module Payday
       ]
 
       tax_description = if invoice.tax_description.nil?
-                          I18n.t('payday.invoice.tax', default: 'Tax:')
-                        else
-                          invoice.tax_description
-                        end
+        I18n.t('payday.invoice.tax', default: 'Tax:')
+      else
+        invoice.tax_description
+      end
 
       table_data << [
         bold_cell(pdf, tax_description),
@@ -239,10 +243,10 @@ module Payday
 
       if invoice.shipping_rate.positive?
         shipping_description = if invoice.shipping_description.nil?
-                                 I18n.t('payday.invoice.shipping', default: 'Shipping:')
-                               else
-                                 invoice.shipping_description
-                               end
+          I18n.t('payday.invoice.shipping', default: 'Shipping:')
+        else
+          invoice.shipping_description
+        end
 
         table_data << [
           bold_cell(pdf, shipping_description),
@@ -256,7 +260,7 @@ module Payday
         cell(pdf, number_to_currency(invoice.total, invoice),
              size: 12, align: :right)
       ]
-      table = pdf.make_table(table_data, cell_style: { borders: [] })
+      table = pdf.make_table(table_data, cell_style: {borders: []})
       pdf.bounding_box([pdf.bounds.width - table.width, pdf.cursor],
                        width: table.width, height: table.height + 2) do
         table.draw
@@ -318,5 +322,7 @@ module Payday
 
       max
     end
+
   end
+
 end

data/lib/payday.rb

@@ -1,18 +1,19 @@
-# Not much to see here
-require 'date'
-require 'time'
+# frozen_string_literal: true
+
+require 'zeitwerk'
+loader = Zeitwerk::Loader.for_gem
+loader.ignore("#{__dir__}/generators")
+loader.setup
+
+require 'active_support/core_ext/object/blank' # For Object#blank? method
 require 'bigdecimal'
+require 'date'
+require 'money'
 require 'prawn'
 require 'prawn/table'
 require 'prawn-svg'
-require 'money'
-require 'active_support/all'
+require 'time'
 
-require_relative 'payday/version'
-require_relative 'payday/config'
-require_relative 'payday/i18n'
-require_relative 'payday/line_itemable'
-require_relative 'payday/line_item'
-require_relative 'payday/pdf_renderer'
-require_relative 'payday/invoiceable'
-require_relative 'payday/invoice'
+# Load translations from the locale folder
+I18n.enforce_available_locales = false
+I18n.load_path.concat(Dir[File.join('lib', 'payday', 'locale', '*.yml')])

data/payday.gemspec

@@ -1,9 +1,8 @@
-$LOAD_PATH.push File.expand_path('lib', __dir__)
-require 'payday/version'
+# frozen_string_literal: true
 
 Gem::Specification.new do |s|
   s.name        = 'webtranslateit-payday'
-  s.version     = Payday::VERSION
+  s.version     = '1.6.0'
   s.required_ruby_version = '>= 3.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Alan Johnson', 'Edouard Briere']
@@ -12,25 +11,15 @@ Gem::Specification.new do |s|
   s.summary     = 'A simple library for rendering invoices.'
   s.description = 'Payday is a library for rendering invoices to pdf.'
 
-  s.add_dependency 'activesupport'
-  s.add_dependency 'i18n', '>= 0.7'
-  s.add_dependency 'money', '~> 6.16'
-  s.add_dependency 'prawn', '>= 2.0'
-  s.add_dependency 'prawn-svg', '>= 0.32.0'
-  s.add_dependency 'prawn-table', '>= 0.2.2'
-  s.add_dependency 'rexml'
-
-  s.add_development_dependency 'guard'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'guard-rubocop'
-  s.add_development_dependency 'matrix' # for compat reasons, required in builds
-  s.add_development_dependency 'rspec', '~> 3.11.0'
-  s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'rubocop-rspec'
+  s.add_dependency 'activesupport', '~> 7', '< 8'
+  s.add_dependency 'i18n', '~> 1.12', '< 2'
+  s.add_dependency 'money', '~> 6.16', '< 7'
+  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 'zeitwerk', '~> 2.6', '< 3'
 
   s.files = `git ls-files`.split("\n")
-  s.executables =
-    `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/spec/invoice_spec.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Payday # rubocop:todo Metrics/ModuleLength
+
   describe Invoice do
     # rubocop:todo RSpec/MultipleExpectations
     it 'is able to be initialized with a hash of options' do # rubocop:todo RSpec/ExampleLength, RSpec/MultipleExpectations
@@ -125,7 +128,7 @@ module Payday # rubocop:todo Metrics/ModuleLength
     it 'is able to iterate through invoice_details as a hash' do # rubocop:todo RSpec/ExampleLength, RSpec/MultipleExpectations
       # rubocop:enable RSpec/MultipleExpectations
       i = described_class.new(invoice_details:
-        { 'Test' => 'Yes', 'Awesome' => 'Absolutely' })
+        {'Test' => 'Yes', 'Awesome' => 'Absolutely'})
       details = []
       i.each_detail do |key, value|
         details << [key, value]
@@ -209,11 +212,11 @@ module Payday # rubocop:todo Metrics/ModuleLength
 
       context 'paid, with an svg logo' do # rubocop:todo RSpec/ContextWording
         before do
-          logo = { filename: 'spec/assets/tiger.svg', size: '100x100' }
+          logo = {filename: 'spec/assets/tiger.svg', size: '100x100'}
           Payday::Config.default.invoice_logo = logo
         end
 
-        let(:invoice_params) { { paid_at: Date.civil(2012, 2, 22) } }
+        let(:invoice_params) { {paid_at: Date.civil(2012, 2, 22)} }
 
         it 'renders an invoice correctly' do # rubocop:todo RSpec/ExampleLength
           invoice.line_items += [
@@ -241,4 +244,5 @@ module Payday # rubocop:todo Metrics/ModuleLength
       end
     end
   end
+
 end

data/spec/line_item_spec.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Payday
+
   describe LineItem do
     it 'is able to be initialized with a price' do
       li = described_class.new(price: BigDecimal('20'))
@@ -27,4 +30,5 @@ module Payday
       expect(li.amount).to eq(BigDecimal('244'))
     end
   end
+
 end

data/spec/pdf_renderer_spec.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Payday
+
   describe PdfRenderer do
     describe '.number_to_currency' do
       it 'formats numbers to currency currectly' do
@@ -8,4 +11,5 @@ module Payday
       end
     end
   end
+
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../lib/payday'
 
 # Requires supporting ruby files with custom matchers and macros, etc, in

data/spec/support/asset_matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 # Usage: expect(renderer.render).to match_binary_asset('pdf/test.pdf')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webtranslateit-payday
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Alan Johnson
@@ -9,36 +9,48 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -46,6 +58,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,160 +68,89 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: prawn-svg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '2.4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
-- !ruby/object:Gem::Dependency
-  name: prawn-table
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '2.4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: rexml
+  name: prawn-svg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.32'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '0.32'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: prawn-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '0.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: matrix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '0.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.11.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '2.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '2.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: Payday is a library for rendering invoices to pdf.
 email:
 - edouard@webtranslateit.com
@@ -216,12 +160,15 @@ 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
@@ -234,7 +181,6 @@ files:
 - lib/generators/payday/setup/templates/migration.rb
 - lib/payday.rb
 - lib/payday/config.rb
-- lib/payday/i18n.rb
 - lib/payday/invoice.rb
 - lib/payday/invoiceable.rb
 - lib/payday/line_item.rb
@@ -246,7 +192,6 @@ files:
 - lib/payday/locale/nl.yml
 - lib/payday/locale/zh-CN.yml
 - lib/payday/pdf_renderer.rb
-- lib/payday/version.rb
 - payday.gemspec
 - spec/assets/default_logo.png
 - spec/assets/svg.pdf

data/lib/payday/i18n.rb

@@ -1,3 +0,0 @@
-# Load everything in the local folder
-I18n.enforce_available_locales = false
-I18n.load_path.concat(Dir[File.join(File.dirname(__FILE__), 'locale', '*.yml')])

data/lib/payday/version.rb

@@ -1,5 +0,0 @@
-# This is Payday!
-module Payday
-  # Current Version
-  VERSION = '1.4.0'.freeze
-end