dorsale 3.17.0 → 3.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edb8363b4a987b737cfba9c432a65fd5c64fbb72690c51f6ea5da99c195430a6
-  data.tar.gz: 9b88ffbea03b8971f2a853c5dfcbe6387670ec7b69d8601d68ab295ba425364c
+  metadata.gz: f967e032d9c4918a372978e3c92216d542751e9e29881843aa029c7d63be401f
+  data.tar.gz: 35fbc1b26a2dea2067f936674324804b8d02fd6a673adfd92354886060b56ced
 SHA512:
-  metadata.gz: c84800985f5243887825313437907d6a40d2ab5398e7c78de903d404a9c3d5e1d01e6bed9c7cee4fe57f15af26d0aa0c1950ede73946dd3d3f8c14a7ce20a6e1
-  data.tar.gz: 373d7d5e133bcb61443e8defed065177fb6e82fc56bc7424abbb110f3632d51a07a24df569f96d2b336206339a2774d26c206d5b1ff6e6862f6d5b63baa061fb
+  metadata.gz: b0bb3cf0a9cd7322cc3e6928101ba486c8dddd577fa9962f1c462612d3c876e2df525224acdc6a2a4902510943ca61c500986431a6b1e895313f246c60467826
+  data.tar.gz: 135ff2e5848baede200b8ab36ba6bed2078f1c56024a8a1e901bcad21b9ae3f0bb700a314d74582006ae9275d6779f082bbcd6d17577af38f9296291fa379c76

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next version
 
+# 3.18.0
+- Change uploaders `extension_whitelist` to `extension_allowlist`
+- Rails 6.1 compatibility
+
 ## 3.17.0
 - Refactor CV models using stores
 - Fix redirect after task comment create

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

@@ -55,7 +55,7 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
     lines.each(&:update_total)
     apply_vat_rate_to_lines
 
-    lines_sum = lines.map(&:total).sum.round(2)
+    lines_sum = lines.sum(&:total).round(2)
 
     self.total_excluding_taxes = lines_sum - commercial_discount
 
@@ -109,9 +109,7 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
   def payment_status
     if paid?
       :paid
-    elsif due_date.nil?
-      :on_alert
-    elsif Date.current >= due_date + 15
+    elsif due_date.nil? || Date.current >= due_date + 15
       :on_alert
     elsif Date.current > due_date
       :late

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

@@ -61,7 +61,7 @@ class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
     lines.each(&:update_total)
     apply_vat_rate_to_lines
 
-    lines_sum = lines.map(&:total).sum
+    lines_sum = lines.sum(&:total)
 
     self.total_excluding_taxes = lines_sum - commercial_discount
 

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

@@ -10,7 +10,7 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   end
 
   def verify_class
-    if self.class == ::Dorsale::CustomerVault::Person
+    if instance_of?(Dorsale::CustomerVault::Person)
       # self.abstract_class does not work with STI
       raise "Cannot directly instantiate Person class"
     end

data/app/models/dorsale/expense_gun/expense.rb

@@ -29,17 +29,17 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
 
   # Sum of line amounts
   def total_all_taxes
-    expense_lines.map(&:total_all_taxes).sum
+    expense_lines.sum(&:total_all_taxes)
   end
 
   # Sum of line emplee payback
   def total_employee_payback
-    expense_lines.map(&:employee_payback).sum
+    expense_lines.sum(&:employee_payback)
   end
 
   # Sum of deductible deductible vat
   def total_vat_deductible
-    expense_lines.map(&:total_vat_deductible).sum
+    expense_lines.sum(&:total_vat_deductible)
   end
 
   delegate :current_state, to: :aasm

data/app/services/dorsale/flyboy/task/snoozer.rb

@@ -29,7 +29,7 @@ class Dorsale::Flyboy::Task::Snoozer < ::Dorsale::Service
       task.reminder_date <= current_date
     elsif task.term
       task.term <= current_date
-    else
+    else # rubocop:disable Lint/DuplicateBranch
       false
     end
   end

data/app/uploaders/dorsale/image_uploader.rb

@@ -1,5 +1,5 @@
 class Dorsale::ImageUploader < ::Dorsale::ApplicationUploader
-  def extension_whitelist
+  def extension_allowlist
     %w(jpg jpeg gif png)
   end
 end

data/app/uploaders/dorsale/pdf_uploader.rb

@@ -1,5 +1,5 @@
 class Dorsale::PdfUploader < ::Dorsale::ApplicationUploader
-  def extension_whitelist
+  def extension_allowlist
     %w(pdf)
   end
 end

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.17.0"
+  VERSION = "3.18.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.18.0
 platform: ruby
 authors:
 - agilidée
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -973,7 +973,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Modular ERP made with Ruby on Rails