dorsale 3.20.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40c57412c903d5b5e12ca0c7fb7abc5103325840da2f27a624d4bdeace505ee4
-  data.tar.gz: a65375f0c67fd74790657e085a8b974cff8eca322e45c31d69bbb6577856b97a
+  metadata.gz: 56b219a64478090857cda126c0be0a10601039d5d5ca2ccb122e22dedf24e1f1
+  data.tar.gz: 3f0880733c208194536f26390e5a2bd9f9c457921dc09bc6ee9400cf9d34c799
 SHA512:
-  metadata.gz: 18694d47b193684c2f80e486fbad25d375e70b2d7b3e63b8fca836a1dd2950c2f2c62a049efc9eec99f2d566f68c624a7654c913dfc7f4dec272b1a6a8617224
-  data.tar.gz: 848df210eb6928360cd50cb254c6d6c905263d8ac46af11d8806166dd5aa89d99d12a03afff0d5d95580cb60e4ac6c0ec9456314677d3c0c5d470951f62cec67
+  metadata.gz: ba48401d91d362381d54fb18baed9336dd332a80f7d20883228767aa183d47a591c4850774bbcb1855ca98fe6701bc20306177f11bc02a7253ac60be60643035
+  data.tar.gz: 5f2d24d3ff51d349b30c42ee2017989ee8e04d9fc6d4e54d67cde9e019bc69be5116fd33a2d0f2a32bfd5e87fb829a09af6457b7a110e1e08c0b314d17c2b43a

data/CHANGELOG.md

@@ -1,17 +1,23 @@
 # Changelog
 
-# 3.20.0
 ## Next version
+
+## 4.0.0
+- Ruby 3.1 required
+- Rails 7.0
+- Zeitwerk compatibility
+
+## 3.20.0
 - Change email deliver_now to deliver_later on save
 
-# 3.19.1
+## 3.19.1
 - Expenses : add colors to list
 
 # 3.19.0
 - Change expenses state machine
 - Change expenses list view
 
-# 3.18.0
+## 3.18.0
 - Change uploaders `extension_whitelist` to `extension_allowlist`
 - Rails 6.1 compatibility
 

data/app/controllers/dorsale/billing_machine/application_controller.rb

@@ -25,6 +25,6 @@ class Dorsale::BillingMachine::ApplicationController < ::Dorsale::ApplicationCon
   def email_params
     params.fetch(:email, {})
       .permit(email_permitted_params)
-      .merge(current_user: current_user)
+      .merge(current_user:)
   end
 end

data/app/helpers/dorsale/alexandrie/attachments_helper.rb

@@ -1,5 +1,5 @@
 module Dorsale::Alexandrie::AttachmentsHelper
   def attachments_for(attachable)
-    render "dorsale/alexandrie/attachments/loader", attachable: attachable
+    render "dorsale/alexandrie/attachments/loader", attachable:
   end
 end

data/app/helpers/dorsale/comments_helper.rb

@@ -1,6 +1,6 @@
 module Dorsale::CommentsHelper
   def comments_for(commentable)
-    comments    = policy_scope(::Dorsale::Comment).where(commentable: commentable)
+    comments    = policy_scope(::Dorsale::Comment).where(commentable:)
     new_comment = new_comment_for(commentable)
 
     render(
@@ -13,7 +13,7 @@ module Dorsale::CommentsHelper
   end
 
   def new_comment_for(commentable)
-    policy_scope(Dorsale::Comment).new(commentable: commentable, author: current_user)
+    policy_scope(Dorsale::Comment).new(commentable:, author: current_user)
   end
 
   def truncate_comments_in_this_page?

data/app/helpers/dorsale/customer_vault/application_helper.rb

@@ -55,7 +55,7 @@ module Dorsale::CustomerVault::ApplicationHelper
   end
 
   def new_event_for(person)
-    policy_scope(Dorsale::CustomerVault::Event).new(person: person, author: current_user)
+    policy_scope(Dorsale::CustomerVault::Event).new(person:, author: current_user)
   end
 
   def customer_vault_tag_list

data/app/helpers/dorsale/flyboy/application_helper.rb

@@ -14,11 +14,11 @@ module Dorsale::Flyboy::ApplicationHelper
       end
     end
 
-    tasks = ::Dorsale::Flyboy::Task.where(taskable: taskable)
+    tasks = ::Dorsale::Flyboy::Task.where(taskable:)
     tasks = @filters.apply(tasks)
     tasks = tasks.order(order)
 
-    render "dorsale/flyboy/tasks/tasks_for_taskable", tasks: tasks, taskable: taskable
+    render "dorsale/flyboy/tasks/tasks_for_taskable", tasks:, taskable:
   end
 
   def show_tasks_summary

data/app/models/dorsale/billing_machine/quotation.rb

@@ -85,12 +85,6 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
     self.total_including_taxes = total_excluding_taxes + vat_amount
   end
 
-  # rubocop:disable Style/SingleLineMethods
-  private def total_excluding_taxes=(*); super; end
-  private def vat_amount=(*);            super; end
-  private def total_including_taxes=(*); super; end
-  # rubocop:enable Style/SingleLineMethods
-
   def balance
     total_including_taxes
   end
@@ -124,4 +118,10 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
   def on_attachment_action(_attachment, _action)
     Dorsale::BillingMachine::PdfFileGenerator.(self)
   end
+
+  # rubocop:disable Style/SingleLineMethods
+  private def total_excluding_taxes=(*); super; end
+  private def vat_amount=(*);            super; end
+  private def total_including_taxes=(*); super; end
+  # rubocop:enable Style/SingleLineMethods
 end

data/app/models/dorsale/customer_vault/person.rb

@@ -58,7 +58,7 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   def taken_emails
     taken_emails = {}
     ([email] + secondary_emails).select(&:present?).each do |e|
-      person = Dorsale::CustomerVault::Person.where.not(id: id).having_email(e).first
+      person = Dorsale::CustomerVault::Person.where.not(id:).having_email(e).first
       taken_emails[e] = person if person.present?
     end
     taken_emails

data/app/models/dorsale/flyboy/task.rb

@@ -120,7 +120,7 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
 
     comments.create!(
       :progress    => progress,
-      :description => I18n.t("messages.tasks.snoozed", old_date: old_date, new_date: new_date),
+      :description => I18n.t("messages.tasks.snoozed", old_date:, new_date:),
       :author      => author,
     )
   end

data/app/pdfs/dorsale/billing_machine/invoice_multiple_vat_pdf.rb

@@ -1,11 +1,11 @@
 class Dorsale::BillingMachine::InvoiceMultipleVatPdf < ::Dorsale::BillingMachine::InvoiceSingleVatPdf
-  # rubocop:disable Style/SingleLineMethods, Layout/EmptyLineBetweenDefs
+  # rubocop:disable Style/SingleLineMethods
   def first_column_width;  64.mm; end
   def second_column_width; 22.mm; end
   def third_column_width;  20.mm; end
   def fourth_column_width; 20.mm; end
   def fifth_column_width;  29.mm; end
-  # rubocop:enable Style/SingleLineMethods, Layout/EmptyLineBetweenDefs
+  # rubocop:enable Style/SingleLineMethods
 
   def last_column_width
     bounds.width - first_column_width - second_column_width - third_column_width - fourth_column_width - fifth_column_width
@@ -32,14 +32,16 @@ class Dorsale::BillingMachine::InvoiceMultipleVatPdf < ::Dorsale::BillingMachine
 
     # Products table
     bb height: height do
-      table_products = [[
-        main_document.t(:designation).mb_chars.upcase.to_s,
-        main_document.t(:quantity).mb_chars.upcase.to_s,
-        main_document.t(:unit).mb_chars.upcase.to_s,
-        main_document.t(:tax).mb_chars.upcase.to_s,
-        main_document.t(:unit_price).mb_chars.upcase.to_s,
-        main_document.t(:line_total).mb_chars.upcase.to_s,
-      ]]
+      table_products = [
+        [
+          main_document.t(:designation).mb_chars.upcase.to_s,
+          main_document.t(:quantity).mb_chars.upcase.to_s,
+          main_document.t(:unit).mb_chars.upcase.to_s,
+          main_document.t(:tax).mb_chars.upcase.to_s,
+          main_document.t(:unit_price).mb_chars.upcase.to_s,
+          main_document.t(:line_total).mb_chars.upcase.to_s,
+        ],
+      ]
 
       main_document.lines.each do |line|
         table_products.push [

data/app/pdfs/dorsale/billing_machine/invoice_single_vat_pdf.rb

@@ -24,7 +24,7 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
     currency(n, Dorsale::BillingMachine.default_currency)
   end
 
-  # rubocop:disable Style/SingleLineMethods, Layout/EmptyLineBetweenDefs
+  # rubocop:disable Style/SingleLineMethods
   def header_height;         90.mm; end
   def logo_height;           32.mm; end
   def logo_width;            50.mm; end
@@ -42,7 +42,7 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
   def second_column_width; 2.4.cm; end
   def third_column_width;  2.5.cm; end
   def fourth_column_width; 2.9.cm; end
-  # rubocop:enable Style/SingleLineMethods, Layout/EmptyLineBetweenDefs
+  # rubocop:enable Style/SingleLineMethods
 
   def last_column_width
     bounds.width - first_column_width - second_column_width - third_column_width - fourth_column_width
@@ -110,7 +110,7 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
 
   def build_contact_infos
     top    = bounds.top - 4.cm
-    width  = bounds.width / 2 - 1.1.cm
+    width  = (bounds.width / 2) - 1.1.cm
     height = contact_infos_height
 
     bb top: top, width: width, height: height do
@@ -120,7 +120,7 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
 
   def build_subject
     top    = bounds.top - 7.5.cm
-    width  = bounds.width / 2 - 1.1.cm
+    width  = (bounds.width / 2) - 1.1.cm
     height = 15.mm
 
     bb top: top, width: width, height: height do
@@ -146,7 +146,7 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
     content << main_document.customer.address.country
 
     if main_document.customer.try(:european_union_vat_number).present?
-      content << main_document.customer.t(:european_union_vat_number) + " : "
+      content << (main_document.customer.t(:european_union_vat_number) + " : ")
       content << main_document.customer.european_union_vat_number
     end
 
@@ -155,8 +155,8 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
 
   def build_customer
     top     = bounds.top - 4.cm
-    left    = bounds.width / 2 + 1.1.cm
-    width   = bounds.width / 2 - 1.1.cm
+    left    = (bounds.width / 2) + 1.1.cm
+    width   = (bounds.width / 2) - 1.1.cm
     height  = 4.5.cm
     padding = 3.mm
 
@@ -177,11 +177,11 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
   end
 
   def has_advance
-    main_document.try(:advance) && main_document.advance.to_d != 0.0.to_d
+    main_document.try(:advance) && main_document.advance.to_d != BigDecimal("0.0")
   end
 
   def has_discount
-    main_document.try(:commercial_discount) && main_document.commercial_discount.to_d != 0.0.to_d
+    main_document.try(:commercial_discount) && main_document.commercial_discount.to_d != BigDecimal("0.0")
   end
 
   def build_table
@@ -199,7 +199,7 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
               fourth_column_width,
               last_column_width,
             ],
-            :cell_style => {height: height} \
+            :cell_style => {height:} \
           do
             row(0).style       :text_color => BLACK
             row(0).style       :font_style => :bold
@@ -212,13 +212,15 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
 
     # Products table
     bb height: height do
-      table_products = [[
-        main_document.t(:designation).mb_chars.upcase.to_s,
-        main_document.t(:quantity).mb_chars.upcase.to_s,
-        main_document.t(:unit).mb_chars.upcase.to_s,
-        main_document.t(:unit_price).mb_chars.upcase.to_s,
-        main_document.t(:line_total).mb_chars.upcase.to_s,
-      ]]
+      table_products = [
+        [
+          main_document.t(:designation).mb_chars.upcase.to_s,
+          main_document.t(:quantity).mb_chars.upcase.to_s,
+          main_document.t(:unit).mb_chars.upcase.to_s,
+          main_document.t(:unit_price).mb_chars.upcase.to_s,
+          main_document.t(:line_total).mb_chars.upcase.to_s,
+        ],
+      ]
 
       main_document.lines.each do |line|
         table_products.push [
@@ -331,7 +333,7 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
     height = middle_height - products_table_height - 5.mm
     width  = 10.cm
 
-    btb document_infos_content, top: top, height: height, width: width
+    btb document_infos_content, top:, height:, width:
   end
 
   def build_footer
@@ -355,7 +357,7 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
   end
 
   def build_footer_line
-    top = bounds.top - footer_top_height - (footer_height - footer_top_height - footer_bottom_height - footer_pagination_height) / 2
+    top = bounds.top - footer_top_height - ((footer_height - footer_top_height - footer_bottom_height - footer_pagination_height) / 2)
     stroke do
       horizontal_line bounds.left, bounds.right, at: top
     end
@@ -369,7 +371,7 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
     height = footer_bottom_height
     top    = bounds.bottom + height + footer_pagination_height
 
-    btb footer_bottom_content, top: top, height: height, size: 9
+    btb footer_bottom_content, top:, height:, size: 9
   end
 
   def build_page_numbers

data/app/services/dorsale/billing_machine/invoice/statistics.rb

@@ -8,21 +8,21 @@ class Dorsale::BillingMachine::Invoice::Statistics
   def total_excluding_taxes
     @total_excluding_taxes ||= @invoices
       .pluck(:total_excluding_taxes)
-      .delete_if(&:blank?)
+      .compact
       .sum
   end
 
   def vat_amount
     @vat_amount ||= @invoices
       .pluck(:vat_amount)
-      .delete_if(&:blank?)
+      .compact
       .sum
   end
 
   def total_including_taxes
     @total_including_taxes ||= @invoices
       .pluck(:total_including_taxes)
-      .delete_if(&:blank?)
+      .compact
       .sum
   end
 

data/app/services/dorsale/billing_machine/quotation/statistics.rb

@@ -9,7 +9,7 @@ class Dorsale::BillingMachine::Quotation::Statistics
     @total_excluding_taxes ||= @quotations
       .where.not(state: "canceled")
       .pluck(:total_excluding_taxes)
-      .delete_if(&:blank?)
+      .compact
       .sum
   end
 
@@ -17,7 +17,7 @@ class Dorsale::BillingMachine::Quotation::Statistics
     @vat_amount ||= @quotations
       .where.not(state: "canceled")
       .pluck(:vat_amount)
-      .delete_if(&:blank?)
+      .compact
       .sum
   end
 
@@ -25,7 +25,7 @@ class Dorsale::BillingMachine::Quotation::Statistics
     @total_including_taxes ||= @quotations
       .where.not(state: "canceled")
       .pluck(:total_including_taxes)
-      .delete_if(&:blank?)
+      .compact
       .sum
   end
 

data/features/step_definitions/billing_machine_invoices_steps.rb

@@ -178,7 +178,7 @@ When(/^the user download the pdf$/) do
 end
 
 Then(/^he should see (\d+) invoices?$/) do |count|
-  expect(page).to have_selector ".invoice", count: count
+  expect(page).to have_selector ".invoice", count:
 end
 
 Then(/^the invoice is displayed correctly$/) do

data/features/step_definitions/customer_vault_corporations_steps.rb

@@ -47,7 +47,7 @@ Then(/^i see an error message for the missing name$/) do
 end
 
 Then(/^he can see (\d+) corporate$/) do |count|
-  expect(page).to have_selector ".person", count: count
+  expect(page).to have_selector ".person", count:
 end
 
 Then(/^the corporation is created$/) do

data/features/step_definitions/customer_vault_people_steps.rb

@@ -8,7 +8,7 @@ end
 
 Given(/^a very long comment on this person$/) do
   text = Faker::Lorem.paragraph(sentence_count: 30)
-  @comment = create(:customer_vault_event_comment, person: @person, text: text)
+  @comment = create(:customer_vault_event_comment, person: @person, text:)
 end
 
 Then(/^I see the truncated comment$/) do

data/features/step_definitions/flyboy_tasks_steps.rb

@@ -7,7 +7,7 @@ Given(/^an existing undone task$/) do
 end
 
 Given(/^an existing task named "(.*?)"$/) do |name|
-  create(:flyboy_task, name: name)
+  create(:flyboy_task, name:)
 end
 
 Given(/^an existing task$/) do

data/lib/dorsale/engine.rb

@@ -35,6 +35,12 @@ module Dorsale
   class Engine < ::Rails::Engine
     isolate_namespace Dorsale
 
+    initializer "inflections" do
+      ActiveSupport::Inflector.inflections(:en) do |inflect|
+        inflect.acronym "DH"
+      end
+    end
+
     initializer "factory_bot" do
       if Rails.env.test? || Rails.env.development?
         FactoryBot.definition_file_paths.unshift Dorsale::Engine.root.join("spec/factories/").to_s

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.20.0"
+  VERSION = "4.0.0"
 end

data/spec/controllers/dorsale/customer_vault/people_controller_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe ::Dorsale::CustomerVault::PeopleController, type: :controller do
 
       it "should filter by person origin" do
         origin      = create(:customer_vault_origin)
-        individual1 = create(:customer_vault_individual, origin: origin)
+        individual1 = create(:customer_vault_individual, origin:)
         individual2 = create(:customer_vault_individual)
 
         cookies[:filters] = {person_origin: origin.id}.to_json
@@ -68,7 +68,7 @@ RSpec.describe ::Dorsale::CustomerVault::PeopleController, type: :controller do
 
       it "should filter by person activity_type" do
         activity_type = create(:customer_vault_activity_type)
-        corporation1  = create(:customer_vault_corporation, activity_type: activity_type)
+        corporation1  = create(:customer_vault_corporation, activity_type:)
         corporation2  = create(:customer_vault_corporation)
 
         cookies[:filters] = {person_activity: activity_type.id}.to_json

data/spec/controllers/dorsale/expense_gun/expenses_controller_spec.rb

@@ -66,7 +66,7 @@ RSpec.describe ::Dorsale::ExpenseGun::ExpensesController, type: :controller do
     render_views
 
     it "should be ok as PDF" do
-      expense = create(:expense_gun_expense, user: user)
+      expense = create(:expense_gun_expense, user:)
       get :show, params: {id: expense, format: :pdf}
       expect(response).to be_ok
     end
@@ -74,7 +74,7 @@ RSpec.describe ::Dorsale::ExpenseGun::ExpensesController, type: :controller do
 
   describe "#go_to_pending" do
     it "should go to pending and redirect" do
-      expense = create(:expense_gun_expense, user: user, state: "draft")
+      expense = create(:expense_gun_expense, user:, state: "draft")
       post :go_to_pending, params: {id: expense}
       expect(response).to be_redirect
       expect(flash.notice).to be_present
@@ -84,7 +84,7 @@ RSpec.describe ::Dorsale::ExpenseGun::ExpensesController, type: :controller do
 
   describe "#go_to_paid" do
     it "should go to paid and redirect" do
-      expense = create(:expense_gun_expense, user: user, state: "pending")
+      expense = create(:expense_gun_expense, user:, state: "pending")
       post :go_to_paid, params: {id: expense}
       expect(response).to be_redirect
       expect(flash.notice).to be_present
@@ -94,7 +94,7 @@ RSpec.describe ::Dorsale::ExpenseGun::ExpensesController, type: :controller do
 
   describe "#go_to_canceled" do
     it "should go to canceled and redirect" do
-      expense = create(:expense_gun_expense, user: user, state: "draft")
+      expense = create(:expense_gun_expense, user:, state: "draft")
       post :go_to_canceled, params: {id: expense}
       expect(response).to be_redirect
       expect(flash.notice).to be_present

data/spec/controllers/dorsale/flyboy/task_comments_controller_spec.rb

@@ -8,7 +8,7 @@ describe Dorsale::Flyboy::TaskCommentsController, type: :controller do
   before(:each) { sign_in(user) }
 
   let(:task)         { create(:flyboy_task) }
-  let(:task_comment) { create(:flyboy_task_comment, task: task) }
+  let(:task_comment) { create(:flyboy_task_comment, task:) }
 
   describe "#create" do
     let(:valid_params) { {task_id: task.id, task_comment: task_comment.attributes} }

data/spec/controllers/dorsale/flyboy/tasks_controller_spec.rb

@@ -20,7 +20,7 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
 
   describe "#complete" do
     before(:each) do
-      request.env["HTTP_REFERER"] = "where_i_came_from"
+      request.env["HTTP_REFERER"] = "/where_i_came_from"
     end
 
     it "should mark the task as done" do
@@ -42,7 +42,7 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
 
     it "should redirect to the referer page" do
       patch :complete, params: {id: task.id}
-      expect(response).to redirect_to "where_i_came_from"
+      expect(response).to redirect_to "/where_i_came_from"
     end
   end
 

data/spec/factories/customer_vault_individuals.rb

@@ -4,7 +4,7 @@ FactoryBot.define do
     first_name { Faker::Name.first_name            }
     last_name  { Faker::Name.last_name             }
     short_name { "SN"                              }
-    email      { Faker::Internet.email(name: name) }
+    email      { Faker::Internet.email(name:) }
     title      { "Individual-Title"                }
     twitter    { "#{first_name}#{last_name}"       }
     www        { Faker::Internet.url               }

data/spec/factories/expense_gun_expenses.rb

@@ -6,7 +6,7 @@ FactoryBot.define do
 
     after(:create) { |expense|
       rand(2..5).times {
-        create(:expense_gun_expense_line, expense: expense)
+        create(:expense_gun_expense_line, expense:)
       }
     }
   end

data/spec/models/dorsale/billing_machine/invoice_line_spec.rb

@@ -30,11 +30,11 @@ describe Dorsale::BillingMachine::InvoiceLine, type: :model do
   end
 
   it "should be sorted by created_at" do
-    line1 = create(:billing_machine_invoice_line, :created_at => Time.zone.now + 1.minute)
-    line2 = create(:billing_machine_invoice_line, :created_at => Time.zone.now + 2.minutes)
-    line3 = create(:billing_machine_invoice_line, :created_at => Time.zone.now + 3.minutes)
-    line4 = create(:billing_machine_invoice_line, :created_at => Time.zone.now + 4.minutes)
-    line3.update!(:created_at => Time.zone.now + 5.minutes)
+    line1 = create(:billing_machine_invoice_line, :created_at => 1.minute.from_now)
+    line2 = create(:billing_machine_invoice_line, :created_at => 2.minutes.from_now)
+    line3 = create(:billing_machine_invoice_line, :created_at => 3.minutes.from_now)
+    line4 = create(:billing_machine_invoice_line, :created_at => 4.minutes.from_now)
+    line3.update!(:created_at => 5.minutes.from_now)
 
     lines = described_class.all
     expect(lines).to eq [line1, line2, line4, line3]

data/spec/models/dorsale/billing_machine/invoice_spec.rb

@@ -129,17 +129,17 @@ describe Dorsale::BillingMachine::Invoice, type: :model do
 
     it "it should be first line vat rate" do
       invoice = create(:billing_machine_invoice)
-      line1   = create(:billing_machine_invoice_line, invoice: invoice, vat_rate: 10)
-      line2   = create(:billing_machine_invoice_line, invoice: invoice, vat_rate: 10)
+      line1   = create(:billing_machine_invoice_line, invoice:, vat_rate: 10)
+      line2   = create(:billing_machine_invoice_line, invoice:, vat_rate: 10)
       expect(invoice.vat_rate).to eq 10
     end
 
     it "it should raise if multiple vat_rates" do
       invoice = create(:billing_machine_invoice)
-      line1   = create(:billing_machine_invoice_line, invoice: invoice, vat_rate: 10)
+      line1   = create(:billing_machine_invoice_line, invoice:, vat_rate: 10)
 
       expect {
-        line2 = create(:billing_machine_invoice_line, invoice: invoice, vat_rate: 15)
+        line2 = create(:billing_machine_invoice_line, invoice:, vat_rate: 15)
       }.to raise_error(RuntimeError)
     end
 
@@ -247,7 +247,7 @@ describe Dorsale::BillingMachine::Invoice, type: :model do
     it "should work fine even with empty lines" do
       invoice = create(:billing_machine_invoice)
 
-      create(:billing_machine_invoice_line, invoice: invoice, quantity: nil, unit_price: nil)
+      create(:billing_machine_invoice_line, invoice:, quantity: nil, unit_price: nil)
 
       expect(invoice.total_excluding_taxes).to eq(0.0)
       expect(invoice.vat_amount).to eq(0)

data/spec/models/dorsale/billing_machine/quotation_line_spec.rb

@@ -30,11 +30,11 @@ describe Dorsale::BillingMachine::QuotationLine do
   end
 
   it "should be sorted by created_at" do
-    line1 = create(:billing_machine_quotation_line, :created_at => Time.zone.now + 1.minute)
-    line2 = create(:billing_machine_quotation_line, :created_at => Time.zone.now + 2.minutes)
-    line3 = create(:billing_machine_quotation_line, :created_at => Time.zone.now + 3.minutes)
-    line4 = create(:billing_machine_quotation_line, :created_at => Time.zone.now + 4.minutes)
-    line3.update!(:created_at => Time.zone.now + 5.minutes)
+    line1 = create(:billing_machine_quotation_line, :created_at => 1.minute.from_now)
+    line2 = create(:billing_machine_quotation_line, :created_at => 2.minutes.from_now)
+    line3 = create(:billing_machine_quotation_line, :created_at => 3.minutes.from_now)
+    line4 = create(:billing_machine_quotation_line, :created_at => 4.minutes.from_now)
+    line3.update!(:created_at => 5.minutes.from_now)
     lines = described_class.all
     expect(lines).to eq [line1, line2, line4, line3]
   end

data/spec/models/dorsale/billing_machine/quotation_spec.rb

@@ -83,17 +83,17 @@ describe Dorsale::BillingMachine::Quotation do
 
     it "it should be first line vat rate" do
       quotation = create(:billing_machine_quotation)
-      line1 = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 10)
-      line2 = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 10)
+      line1 = create(:billing_machine_quotation_line, quotation:, vat_rate: 10)
+      line2 = create(:billing_machine_quotation_line, quotation:, vat_rate: 10)
       expect(quotation.vat_rate).to eq 10
     end
 
     it "it should raise if multiple vat_rates" do
       quotation = create(:billing_machine_quotation)
-      line1     = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 10)
+      line1     = create(:billing_machine_quotation_line, quotation:, vat_rate: 10)
 
       expect {
-        line2 = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 15)
+        line2 = create(:billing_machine_quotation_line, quotation:, vat_rate: 15)
       }.to raise_error(RuntimeError)
     end
 

data/spec/models/dorsale/customer_vault/individual_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe ::Dorsale::CustomerVault::Individual, :type => :model do
   describe "activity type" do
     it "should have the same activity than his corporation" do
       corporation = create(:customer_vault_corporation)
-      individual = create(:customer_vault_individual, corporation: corporation)
+      individual = create(:customer_vault_individual, corporation:)
       expect(individual.activity_type).to eq corporation.activity_type
     end
 
@@ -37,7 +37,7 @@ RSpec.describe ::Dorsale::CustomerVault::Individual, :type => :model do
 
     it "should have no activity if his corporation has no activity" do
       corporation = create(:customer_vault_corporation, activity_type: nil)
-      individual = create(:customer_vault_individual, corporation: corporation)
+      individual = create(:customer_vault_individual, corporation:)
       expect(individual.activity_type).to eq nil
     end
   end

data/spec/models/dorsale/customer_vault/person_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe ::Dorsale::CustomerVault::Person, type: :model do
 
   it "should return self_and_related_events" do
     corporation       = create(:customer_vault_corporation)
-    individual        = create(:customer_vault_individual, corporation: corporation)
+    individual        = create(:customer_vault_individual, corporation:)
     corporation_event = create(:customer_vault_event, person: corporation)
     individual_event  = create(:customer_vault_event, person: individual)
 

data/spec/models/dorsale/expense_gun/expense_line_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe ::Dorsale::ExpenseGun::ExpenseLine, type: :model do
 
   it "#total_vat_deductible should be 0 if categorie is non vat_decuctible" do
     category     = build(:expense_gun_category, vat_deductible: false)
-    expense_line = build(:expense_gun_expense_line, category: category)
+    expense_line = build(:expense_gun_expense_line, category:)
     expect(expense_line.total_vat_deductible).to eq 0.0
   end
 end

data/spec/models/dorsale/flyboy/task_comment_spec.rb

@@ -16,19 +16,19 @@ describe Dorsale::Flyboy::TaskComment do
 
   it "should update the task progress upon creation" do
     task    = create(:flyboy_task, progress: 10)
-    comment = create(:flyboy_task_comment, progress: 20, task: task)
+    comment = create(:flyboy_task_comment, progress: 20, task:)
     expect(task.reload.progress).to eq(20)
   end
 
   it "should mark task as complete when progress == 100" do
     task    = create(:flyboy_task, progress: 10, done: false)
-    comment = create(:flyboy_task_comment, progress: 100, task: task)
+    comment = create(:flyboy_task_comment, progress: 100, task:)
     expect(task.reload.done).to be true
   end
 
   it "should mark task as un complete when progress < 100" do
     task    = create(:flyboy_task, progress: 100, done: true)
-    comment = create(:flyboy_task_comment, progress: 90, task: task)
+    comment = create(:flyboy_task_comment, progress: 90, task:)
     expect(task.reload.done).to be false
   end
 
@@ -44,8 +44,8 @@ describe Dorsale::Flyboy::TaskComment do
 
     it "#new progress should not override exisring progress" do
       task = create(:flyboy_task)
-      comment1 = create(:flyboy_task_comment, task: task, progress: 30)
-      comment2 = create(:flyboy_task_comment, task: task, progress: 50)
+      comment1 = create(:flyboy_task_comment, task:, progress: 30)
+      comment2 = create(:flyboy_task_comment, task:, progress: 50)
       expect(task.reload.progress).to eq 50
       expect(comment1.reload.progress).to eq 30
       expect(comment2.reload.progress).to eq 50

data/spec/models/dorsale/flyboy/task_spec.rb

@@ -235,7 +235,7 @@ describe Dorsale::Flyboy::Task do
 
     it "should create comment" do
       expect {
-        task.create_term_changed_comment!(previous: Date.new(2019, 10, 1), author: author)
+        task.create_term_changed_comment!(previous: Date.new(2019, 10, 1), author:)
       }.to change(Dorsale::Flyboy::TaskComment, :count).by(1)
 
       task_comment = task.comments.last_created
@@ -247,7 +247,7 @@ describe Dorsale::Flyboy::Task do
 
     it "should not create comment if date not changed" do
       expect {
-        task.create_term_changed_comment!(previous: Date.new(2019, 10, 2), author: author)
+        task.create_term_changed_comment!(previous: Date.new(2019, 10, 2), author:)
       }.to_not change(Dorsale::Flyboy::TaskComment, :count)
     end
   end # describe "#create_term_changed_comment!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.20.0
+  version: 4.0.0
 platform: ruby
 authors:
 - agilidée
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -948,7 +948,7 @@ homepage: https://github.com/agilidee/dorsale
 licenses:
 - Nonstandard
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -956,144 +956,144 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Modular ERP made with Ruby on Rails
 test_files:
-- spec/spec_helper.rb
-- spec/mailers/user_mailer_spec.rb
-- spec/models/dorsale/billing_machine_spec.rb
-- spec/models/dorsale/i18n_spec.rb
-- spec/models/dorsale/alexandrie/attachment_spec.rb
-- spec/models/dorsale/alexandrie/attachment_type_spec.rb
-- spec/models/dorsale/expense_gun/expense_spec.rb
-- spec/models/dorsale/expense_gun/expense_line_spec.rb
-- spec/models/dorsale/expense_gun/category_spec.rb
-- spec/models/dorsale/email_spec.rb
-- spec/models/dorsale/customer_vault/person_spec.rb
-- spec/models/dorsale/customer_vault/individual_spec.rb
-- spec/models/dorsale/customer_vault/activity_type_spec.rb
-- spec/models/dorsale/customer_vault/origin_spec.rb
-- spec/models/dorsale/customer_vault/event_spec.rb
-- spec/models/dorsale/customer_vault/corporation_spec.rb
-- spec/models/dorsale/customer_vault/link_spec.rb
-- spec/models/dorsale/users_spec.rb
-- spec/models/dorsale/billing_machine/quotation_line_spec.rb
-- spec/models/dorsale/billing_machine/quotation_spec.rb
-- spec/models/dorsale/billing_machine/invoice_line_spec.rb
-- spec/models/dorsale/billing_machine/invoice_spec.rb
-- spec/models/dorsale/comment_spec.rb
-- spec/models/dorsale/flyboy/task_spec.rb
-- spec/models/dorsale/flyboy/task_comment_spec.rb
-- spec/models/dorsale/address_spec.rb
-- spec/sorters/dorsale/expense_gun/expenses_sorter_spec.rb
-- spec/support/devise.rb
-- spec/support/message_delivery.rb
-- spec/factories/expense_gun_categories.rb
-- spec/factories/dorsale_addresses.rb
-- spec/factories/billing_machine_invoice_lines.rb
-- spec/factories/customer_vault_origins.rb
-- spec/factories/customer_vault_links.rb
+- spec/controllers/dorsale/alexandrie/attachments_controller_spec.rb
+- spec/controllers/dorsale/billing_machine/invoices_controller_spec.rb
+- spec/controllers/dorsale/billing_machine/quotations_controller_spec.rb
+- spec/controllers/dorsale/comments_controller_spec.rb
+- spec/controllers/dorsale/customer_vault/events_controller_spec.rb
+- spec/controllers/dorsale/customer_vault/people_controller_spec.rb
+- spec/controllers/dorsale/expense_gun/expenses_controller_spec.rb
+- spec/controllers/dorsale/flyboy/task_comments_controller_spec.rb
+- spec/controllers/dorsale/flyboy/tasks_controller_spec.rb
+- spec/factories/alexandrie_attachment_types.rb
 - spec/factories/alexandrie_attachments.rb
-- spec/factories/customer_vault_event.rb
+- spec/factories/billing_machine_invoice_lines.rb
 - spec/factories/billing_machine_invoices.rb
-- spec/factories/customer_vault_activity_types.rb
 - spec/factories/billing_machine_payment_terms.rb
-- spec/factories/customer_vault_corporations.rb
-- spec/factories/expense_gun_expenses.rb
-- spec/factories/alexandrie_attachment_types.rb
+- spec/factories/billing_machine_quotation_lines.rb
 - spec/factories/billing_machine_quotations.rb
-- spec/factories/flyboy_tasks.rb
+- spec/factories/customer_vault_activity_types.rb
+- spec/factories/customer_vault_corporations.rb
+- spec/factories/customer_vault_event.rb
 - spec/factories/customer_vault_individuals.rb
-- spec/factories/billing_machine_quotation_lines.rb
-- spec/factories/expense_gun_expense_lines.rb
+- spec/factories/customer_vault_links.rb
+- spec/factories/customer_vault_origins.rb
+- spec/factories/dorsale_addresses.rb
 - spec/factories/dorsale_comments.rb
+- spec/factories/expense_gun_categories.rb
+- spec/factories/expense_gun_expense_lines.rb
+- spec/factories/expense_gun_expenses.rb
 - spec/factories/flyboy_task_comments.rb
+- spec/factories/flyboy_tasks.rb
 - spec/files/avatar.png
 - spec/files/pdf.pdf
-- spec/pdfs/dorsale/expense_gun/expense_pdf_spec.rb
+- spec/mailers/user_mailer_spec.rb
+- spec/models/dorsale/address_spec.rb
+- spec/models/dorsale/alexandrie/attachment_spec.rb
+- spec/models/dorsale/alexandrie/attachment_type_spec.rb
+- spec/models/dorsale/billing_machine/invoice_line_spec.rb
+- spec/models/dorsale/billing_machine/invoice_spec.rb
+- spec/models/dorsale/billing_machine/quotation_line_spec.rb
+- spec/models/dorsale/billing_machine/quotation_spec.rb
+- spec/models/dorsale/billing_machine_spec.rb
+- spec/models/dorsale/comment_spec.rb
+- spec/models/dorsale/customer_vault/activity_type_spec.rb
+- spec/models/dorsale/customer_vault/corporation_spec.rb
+- spec/models/dorsale/customer_vault/event_spec.rb
+- spec/models/dorsale/customer_vault/individual_spec.rb
+- spec/models/dorsale/customer_vault/link_spec.rb
+- spec/models/dorsale/customer_vault/origin_spec.rb
+- spec/models/dorsale/customer_vault/person_spec.rb
+- spec/models/dorsale/email_spec.rb
+- spec/models/dorsale/expense_gun/category_spec.rb
+- spec/models/dorsale/expense_gun/expense_line_spec.rb
+- spec/models/dorsale/expense_gun/expense_spec.rb
+- spec/models/dorsale/flyboy/task_comment_spec.rb
+- spec/models/dorsale/flyboy/task_spec.rb
+- spec/models/dorsale/i18n_spec.rb
+- spec/models/dorsale/users_spec.rb
+- spec/pdfs/dorsale/billing_machine/invoice_multiple_vat_pdf_spec.rb
 - spec/pdfs/dorsale/billing_machine/invoice_single_vat_pdf_spec.rb
 - spec/pdfs/dorsale/billing_machine/quotation_multiple_vat_pdf_spec.rb
 - spec/pdfs/dorsale/billing_machine/quotation_single_vat_pdf_spec.rb
-- spec/pdfs/dorsale/billing_machine/invoice_multiple_vat_pdf_spec.rb
+- spec/pdfs/dorsale/expense_gun/expense_pdf_spec.rb
+- spec/rails_helper.rb
 - spec/routing/dorsale/alexandrie/attachments_routing_spec.rb
+- spec/routing/dorsale/billing_machine/invoices_routing_spec.rb
+- spec/routing/dorsale/billing_machine/quotations_routing_spec.rb
 - spec/routing/dorsale/comments_routing_spec.rb
-- spec/routing/dorsale/expense_gun/expenses_routing_spec.rb
-- spec/routing/dorsale/users_routing_spec.rb
 - spec/routing/dorsale/customer_vault/activity_types_routing_spec.rb
+- spec/routing/dorsale/customer_vault/events_routing_spec.rb
 - spec/routing/dorsale/customer_vault/origins_routing_spec.rb
 - spec/routing/dorsale/customer_vault/people_routing_spec.rb
-- spec/routing/dorsale/customer_vault/events_routing_spec.rb
-- spec/routing/dorsale/billing_machine/quotations_routing_spec.rb
-- spec/routing/dorsale/billing_machine/invoices_routing_spec.rb
-- spec/routing/dorsale/flyboy/tasks_routing_spec.rb
+- spec/routing/dorsale/expense_gun/expenses_routing_spec.rb
 - spec/routing/dorsale/flyboy/task_comments_routing_spec.rb
-- spec/controllers/dorsale/alexandrie/attachments_controller_spec.rb
-- spec/controllers/dorsale/comments_controller_spec.rb
-- spec/controllers/dorsale/expense_gun/expenses_controller_spec.rb
-- spec/controllers/dorsale/customer_vault/events_controller_spec.rb
-- spec/controllers/dorsale/customer_vault/people_controller_spec.rb
-- spec/controllers/dorsale/billing_machine/invoices_controller_spec.rb
-- spec/controllers/dorsale/billing_machine/quotations_controller_spec.rb
-- spec/controllers/dorsale/flyboy/tasks_controller_spec.rb
-- spec/controllers/dorsale/flyboy/task_comments_controller_spec.rb
-- spec/rails_helper.rb
-- spec/services/dorsale/expense_gun/expense/copy_spec.rb
-- spec/services/dorsale/billing_machine/quotation/statistics.rb
+- spec/routing/dorsale/flyboy/tasks_routing_spec.rb
+- spec/routing/dorsale/users_routing_spec.rb
 - spec/services/dorsale/billing_machine/quotation/copy_spec.rb
+- spec/services/dorsale/billing_machine/quotation/statistics.rb
 - spec/services/dorsale/billing_machine/quotation/to_invoice_spec.rb
+- spec/services/dorsale/expense_gun/expense/copy_spec.rb
 - spec/services/dorsale/flyboy/task/copy_spec.rb
 - spec/services/dorsale/flyboy/task/snoozer_spec.rb
-- features/customer_vault_people.feature
-- features/expense_gun_categories.feature
-- features/customer_vault_activity_types.feature
-- features/users_management.feature
-- features/customer_vault_individuals.feature
-- features/billing_machine_quotations.feature
-- features/expense_gun_expenses.feature
+- spec/sorters/dorsale/expense_gun/expenses_sorter_spec.rb
+- spec/spec_helper.rb
+- spec/support/devise.rb
+- spec/support/message_delivery.rb
 - features/access.feature
-- features/flyboy_tasks_summary.feature
-- features/customer_vault_corporations.feature
 - features/billing_machine_invoices.feature
-- features/support/env.rb
-- features/customer_vault_search.feature
+- features/billing_machine_multiple_vat.feature
 - features/billing_machine_payment_terms.feature
+- features/billing_machine_quotations.feature
+- features/customer_vault_activity_types.feature
+- features/customer_vault_corporations.feature
+- features/customer_vault_filters.feature
+- features/customer_vault_individuals.feature
+- features/customer_vault_invoices.feature
+- features/customer_vault_links.feature
 - features/customer_vault_origins.feature
-- features/billing_machine_multiple_vat.feature
-- features/step_definitions/customer_vault_filters_steps.rb
-- features/step_definitions/billing_machine_quotations_steps.rb
-- features/step_definitions/customer_vault_search_steps.rb
-- features/step_definitions/expense_gun_expenses_steps.rb
-- features/step_definitions/customer_vault_corporations_steps.rb
-- features/step_definitions/tasks_summary_steps.rb
-- features/step_definitions/flyboy_tasks_steps.rb
-- features/step_definitions/customer_vault_individuals_steps.rb
-- features/step_definitions/billing_machine_payment_terms_steps.rb
+- features/customer_vault_people.feature
+- features/customer_vault_search.feature
+- features/customer_vault_tasks.feature
+- features/expense_gun_categories.feature
+- features/expense_gun_expenses.feature
+- features/flyboy_task_comments.feature
+- features/flyboy_tasks.feature
+- features/flyboy_tasks_summary.feature
+- features/step_definitions/access_steps.rb
 - features/step_definitions/alexandrie_steps.rb
 - features/step_definitions/billing_machine_invoices_steps.rb
 - features/step_definitions/billing_machine_multiple_vat.rb
+- features/step_definitions/billing_machine_payment_terms_steps.rb
+- features/step_definitions/billing_machine_quotations_steps.rb
+- features/step_definitions/common_steps.rb
+- features/step_definitions/customer_vault_activity_types_steps.rb
+- features/step_definitions/customer_vault_corporations_steps.rb
+- features/step_definitions/customer_vault_filters_steps.rb
+- features/step_definitions/customer_vault_individuals_steps.rb
 - features/step_definitions/customer_vault_invoices_steps.rb
+- features/step_definitions/customer_vault_links_steps.rb
+- features/step_definitions/customer_vault_origins_steps.rb
 - features/step_definitions/customer_vault_people_steps.rb
-- features/step_definitions/users_management_step.rb
+- features/step_definitions/customer_vault_search_steps.rb
+- features/step_definitions/customer_vault_tasks_steps.rb
 - features/step_definitions/expense_gun_categories_steps.rb
-- features/step_definitions/customer_vault_origins_steps.rb
+- features/step_definitions/expense_gun_expenses_steps.rb
 - features/step_definitions/flyboy_task_comments_steps.rb
-- features/step_definitions/customer_vault_activity_types_steps.rb
-- features/step_definitions/customer_vault_tasks_steps.rb
-- features/step_definitions/common_steps.rb
-- features/step_definitions/access_steps.rb
-- features/step_definitions/customer_vault_links_steps.rb
-- features/customer_vault_invoices.feature
-- features/customer_vault_links.feature
-- features/customer_vault_filters.feature
-- features/flyboy_task_comments.feature
-- features/customer_vault_tasks.feature
-- features/flyboy_tasks.feature
+- features/step_definitions/flyboy_tasks_steps.rb
+- features/step_definitions/tasks_summary_steps.rb
+- features/step_definitions/users_management_step.rb
+- features/support/env.rb
+- features/users_management.feature