dorsale 3.10.0 → 3.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99dec4abf499000f2dd5056f0ad64e158982020b
-  data.tar.gz: 8880c252a553956e6d24ac1723c20a9d46108a36
+  metadata.gz: 6559b13a1111e750335152391d9ad213511c9ff0
+  data.tar.gz: dff3aeadb39a076fdbde226fab8be96655a36a9b
 SHA512:
-  metadata.gz: 98a8ede0dc3303cf86f0f275a153df7d4cc0fd4409dfd0faee7baf3101cb5c03c0a6bd6d0bc72e64fbec1bc3f12bd012c5c3b989935f3964e59818c0d682fb04
-  data.tar.gz: 29e5a4f979b8fa53a478f65a6092ac5fd5c74bb6a92618d74f4a97e6d8fabe1264e468de69cae688555ea4195287809b9852947b08772e9633ebc71f0e3b238a
+  metadata.gz: 2d68ee55bcee6d19c132bab307068d404c01c8e297332d806b8c58bae0bc529c6ea3c8f93f406b15aadf2d2a253e0d506a18543cae11566f4b9c8f7e3f748576
+  data.tar.gz: 10287be7d16627f1a5f74cd8821dcd23e14e97f46ed6c50ff3d74355dbc0858501fe6ef13891f15657beaba7132f809f5d3ebbc9470b9ffed4dd813801094b0c

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next version
 
+## 3.10.1
+
+- Email fixes and improvements
+
 ## 3.10.0
 
 - Billing Machine : fix amounts round

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

@@ -13,7 +13,9 @@ class Dorsale::BillingMachine::Email < Dorsale::Email
   end
 
   def default_to
-    "#{document.customer} <#{document.customer.email}>" if document.customer
+    return if document.customer&.email.blank?
+
+    "#{document.customer} <#{document.customer.email}>"
   end
 
   def default_subject

data/app/models/dorsale/email.rb

@@ -1,3 +1,5 @@
+require "mail"
+
 class Dorsale::Email
   include ActiveModel::Model
   include Agilibox::ModelToS
@@ -7,6 +9,8 @@ class Dorsale::Email
   validates :subject, presence: true
   validates :body,    presence: true
 
+  validate :validate_to_and_cc_format
+
   attr_accessor(
     :current_user,
     :from,
@@ -77,4 +81,17 @@ class Dorsale::Email
   def default_attachments
     {}
   end
+
+  def validate_to_and_cc_format
+    validate_addrs_format(:to)
+    validate_addrs_format(:cc)
+  end
+
+  def validate_addrs_format(attr)
+    string = public_send(attr).to_s
+    return if string.blank?
+    addrs  = Mail.new(to: string).to_addrs
+    return true if addrs.any? && addrs.all? { |addr| URI::MailTo::EMAIL_REGEXP.match?(addr) }
+    errors.add(attr, :invalid)
+  end
 end

data/config/locales/dorsale.fr.yml

@@ -46,7 +46,7 @@ fr:
       dorsale/email:
         from: "Expéditeur"
         to: "Destinataire"
-        cc: "Copie cachée"
+        cc: "Copie"
         subject: "Objet"
         body: "Message"
         attachments: "Pièces jointes"

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.10.0"
+  VERSION = "3.10.1"
 end

data/spec/models/dorsale/email_spec.rb

@@ -0,0 +1,39 @@
+require "rails_helper"
+
+describe Dorsale::Email do
+  describe "validations" do
+    it "should validate :to format" do
+      email = described_class.new
+
+      expect(email).to allow_value("user@example.org").for(:to)
+      expect(email).to allow_value("user1@example.org,user2@example.org").for(:to)
+      expect(email).to allow_value("user1@example.org;user2@example.org").for(:to)
+      expect(email).to allow_value("User <user@example.com>").for(:to)
+      expect(email).to allow_value("<user@example.com>").for(:to)
+      expect(email).to allow_value("User <user@example.com>;user2@example.org").for(:to)
+
+      expect(email).to_not allow_value("user").for(:to)
+      expect(email).to_not allow_value("user@example.com>").for(:to)
+      expect(email).to_not allow_value("<user@example.com").for(:to)
+      expect(email).to_not allow_value("valid@example.com;invalid").for(:to)
+    end
+
+    it "should validate :cc format" do
+      email = described_class.new
+
+      expect(email).to allow_value("").for(:cc)
+
+      expect(email).to allow_value("user@example.org").for(:cc)
+      expect(email).to allow_value("user1@example.org,user2@example.org").for(:cc)
+      expect(email).to allow_value("user1@example.org;user2@example.org").for(:cc)
+      expect(email).to allow_value("User <user@example.com>").for(:cc)
+      expect(email).to allow_value("<user@example.com>").for(:cc)
+      expect(email).to allow_value("User <user@example.com>;user2@example.org").for(:cc)
+
+      expect(email).to_not allow_value("user").for(:cc)
+      expect(email).to_not allow_value("user@example.com>").for(:cc)
+      expect(email).to_not allow_value("<user@example.com").for(:cc)
+      expect(email).to_not allow_value("valid@example.com;invalid").for(:to)
+    end
+  end # describe "validations" do
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.1
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -971,6 +971,7 @@ files:
 - 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
@@ -1037,6 +1038,7 @@ test_files:
 - 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