agilibox 1.3.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f15e9e0b1db8b6b6735af5aa25e30390bfecbc8556c1f3a460e123335dde463
-  data.tar.gz: 1bacaf3648533dfc130a0a77256e5a11c1583aaec0d2c5299a1a85cba862c7ae
+  metadata.gz: 698634df72b0e0a386b55326f55b22246c392bbf4488d0c78b0fb97b7f230c4f
+  data.tar.gz: 9cf623860c2e7dc514435ac01116a46948b6d415d0113b765bb239407fd44b72
 SHA512:
-  metadata.gz: 4b03b38d3f15eed681d0cb69e8d620acaa1b95b900233a42ad4f2b7bc46d98600162baefc077af9f69c875b6c426a7a3ac0671afda9cefde23e2c67ec199aa24
-  data.tar.gz: 469426483f126c9fc06f475799e741bcde20e9e64d7cf3e2a7c7239681efa3add46a9c251f2d2d9e9da7662e35c135bf410a89872f4436833e33680f8d30ffdf
+  metadata.gz: 1da109149aa05456d4d5b156f103788a66e998436218137a5aca38dc9d66a5e78eefdd7df302d2d3dc86708468f2e58e73b0a1067e4a5a227e6642260cdd6f63
+  data.tar.gz: dde577f9d385392ba9aa5546cc1e9882989a58edb1ec5956bdf51cd1f61f1128efa5820e0d3bb812b7eb41512000f34ed26747f23ced3e053310933418d5236e

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Next version
 
+## 1.4.0
+
+- Add `Agilibox::Email`
+- Add `Agilibox.parent_controller` config
+- Add `Agilibox.parent_mailer` config
+- Filters improvements
+
 ## 1.3.6
 
 - Remove deprecated `Agilibox::SortableUUIDGenerator::generate`

data/app/controllers/agilibox/application_controller.rb

@@ -1,5 +1,3 @@
-module Agilibox
-  class ApplicationController < ActionController::Base
-    protect_from_forgery with: :exception
-  end
+class Agilibox::ApplicationController < Agilibox.parent_controller
+  protect_from_forgery with: :exception
 end

data/app/controllers/agilibox/small_data/filters_controller.rb

@@ -1,4 +1,8 @@
 class Agilibox::SmallData::FiltersController < ::Agilibox::ApplicationController
+  skip_after_action  :verify_authorized,         raise: false
+  skip_after_action  :verify_policy_scoped,      raise: false
+  skip_before_action :verify_authenticity_token, raise: false
+
   def create
     skip_authorization if respond_to?(:skip_authorization)
     skip_policy_scope  if respond_to?(:skip_policy_scope)

data/app/emails/agilibox/email.rb

@@ -0,0 +1,113 @@
+class Agilibox::Email
+  include ActiveModel::Model
+  include Agilibox::ModelToS
+  include Agilibox::ModelI18n
+
+  validates :to,      presence: true
+  validates :subject, presence: true
+  validates :body,    presence: true
+
+  validate :validate_addr_formats
+
+  attr_accessor(
+    :current_user,
+    :from,
+    :reply_to,
+    :to,
+    :cc,
+    :subject,
+    :body,
+    :attachments,
+  )
+
+  def initialize(*)
+    super
+    assign_default_values
+  end
+
+  def attachment_names
+    attachments.keys.join(", ")
+  end
+
+  def validate_and_deliver
+    ok = valid?
+    deliver if ok
+    ok
+  end
+
+  def data
+    {
+      :from        => from,
+      :reply_to    => reply_to,
+      :to          => to,
+      :cc          => cc,
+      :subject     => subject,
+      :body        => body,
+      :attachments => attachments,
+    }
+  end
+
+  def deliver
+    deliver_now
+  end
+
+  def deliver_now
+    Agilibox::GenericMailer.generic_email(data).deliver_now
+  end
+
+  def deliver_later
+    Agilibox::GenericMailer.generic_email(data).deliver_later
+  end
+
+  private
+
+  def assign_default_values
+    self.from        ||= default_from
+    self.reply_to    ||= default_reply_to
+    self.to          ||= default_to
+    self.cc          ||= default_cc
+    self.subject     ||= default_subject
+    self.body        ||= default_body
+    self.attachments ||= default_attachments
+  end
+
+  def default_from
+  end
+
+  def default_reply_to
+    "#{current_user} <#{current_user.email}>" if current_user
+  end
+
+  def default_to
+  end
+
+  def default_cc
+  end
+
+  def default_subject
+  end
+
+  def default_body
+  end
+
+  def default_attachments
+    {}
+  end
+
+  def validate_addr_formats
+    validate_addr_formats_for(:from)
+    validate_addr_formats_for(:reply_to)
+    validate_addr_formats_for(:to)
+    validate_addr_formats_for(:cc)
+  end
+
+  def validate_addr_formats_for(attr)
+    require "mail"
+
+    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/app/filters/agilibox/small_data/filter.rb

@@ -8,7 +8,7 @@ class Agilibox::SmallData::Filter
   end
 
   def strategies
-    self.class::STRATEGIES
+    self.class::STRATEGIES.with_indifferent_access
   end
 
   def apply(query)

data/app/mailers/agilibox/application_mailer.rb

@@ -0,0 +1,2 @@
+class Agilibox::ApplicationMailer < Agilibox.parent_mailer
+end

data/app/mailers/agilibox/generic_mailer.rb

@@ -0,0 +1,9 @@
+class Agilibox::GenericMailer < Agilibox::ApplicationMailer
+  def generic_email(data)
+    data.delete(:attachments).to_h.each do |filename, content|
+      attachments[filename] = content
+    end
+
+    mail(data)
+  end
+end

data/config/locales/attributes.en.yml

@@ -94,3 +94,15 @@ en:
 
   labels:
     <<: *attributes
+
+  activemodel:
+    attributes:
+      agilibox/email:
+        from: "From"
+        reply_to: "Reply to"
+        to: "To"
+        cc: "Copy"
+        subject: "Subject"
+        body: "Message"
+        attachments: "Attachments"
+        attachment_names: "Attachments"

data/config/locales/attributes.fr.yml

@@ -94,3 +94,15 @@ fr:
 
   labels:
     <<: *attributes
+
+  activemodel:
+    attributes:
+      agilibox/email:
+        from: "Expéditeur"
+        reply_to: "Répondre à"
+        to: "Destinataire"
+        cc: "Copie"
+        subject: "Objet"
+        body: "Message"
+        attachments: "Pièces jointes"
+        attachment_names: "Pièces jointes"

data/lib/agilibox/config.rb

@@ -0,0 +1,19 @@
+class << Agilibox
+  attr_writer :parent_controller
+
+  def parent_controller
+    @parent_controller ||= [
+      "ApplicationController",
+      "ActionController::Base",
+    ].map(&:safe_constantize).compact.first
+  end
+
+  attr_writer :parent_mailer
+
+  def parent_mailer
+    @parent_mailer ||= [
+      "ApplicationMailer",
+      "ActionMailer::Base",
+    ].map(&:safe_constantize).compact.first
+  end
+end

data/lib/agilibox/engine.rb

@@ -13,5 +13,6 @@ module Agilibox
   end
 end
 
+require_relative "config"
 require_relative "engine_file"
 require_relative "core_and_rails_ext"

data/lib/agilibox/version.rb

@@ -1,3 +1,3 @@
 module Agilibox
-  VERSION = "1.3.6"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.4.0
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -82,6 +82,7 @@ files:
 - app/controllers/agilibox/small_data/filters_controller.rb
 - app/controllers/concerns/agilibox/api_controller_concern.rb
 - app/controllers/concerns/agilibox/back_url_concern.rb
+- app/emails/agilibox/email.rb
 - app/filters/agilibox/small_data/filter.rb
 - app/filters/agilibox/small_data/filter_strategy.rb
 - app/filters/agilibox/small_data/filter_strategy_by_date.rb
@@ -118,6 +119,8 @@ files:
 - app/libs/agilibox/phone_number_sanitizer.rb
 - app/libs/agilibox/sortable_uuid_generator.rb
 - app/libs/agilibox/token_generator.rb
+- app/mailers/agilibox/application_mailer.rb
+- app/mailers/agilibox/generic_mailer.rb
 - app/models/concerns/agilibox/active_record_uuid_concern.rb
 - app/models/concerns/agilibox/default_values_concern.rb
 - app/models/concerns/agilibox/model_i18n.rb
@@ -154,6 +157,7 @@ files:
 - lib/agilibox.rb
 - lib/agilibox/active_model_custom_error_messages.rb
 - lib/agilibox/active_record_comma_type_cast.rb
+- lib/agilibox/config.rb
 - lib/agilibox/core_and_rails_ext.rb
 - lib/agilibox/cucumber_config.rb
 - lib/agilibox/cucumber_helpers/agilibox.rb