udongo 2.0.4 → 3.0.0

data/app/forms/backend/email_template_translation_form.rb

@@ -1,33 +1,11 @@
-class Backend::EmailTemplateTranslationForm < Udongo::Form
-  attr_reader :email_template, :translation
-
+class Backend::EmailTemplateTranslationForm < Backend::TranslationForm
   attribute :subject, String
   attribute :plain_content, String
   attribute :html_content, String
 
   validates :subject, :plain_content, :html_content, presence: true
 
-  delegate :id, to: :email_template
-
-  def initialize(email_template, translation)
-    @email_template = email_template
-    @translation = translation
-
-    init_attribute_values(@translation)
-  end
-
   def self.model_name
     EmailTemplate.model_name
   end
-
-  def persisted?
-    true
-  end
-
-  private
-
-  def save_object
-    init_object_values(@translation)
-    @translation.save
-  end
 end

data/app/forms/backend/navigation_item_translation_form.rb

@@ -1,30 +1,8 @@
-class Backend::NavigationItemTranslationForm < Udongo::Form
-  attr_reader :navigation_item, :translation
-
+class Backend::NavigationItemTranslationForm < Backend::TranslationForm
   attribute :label, String
   attribute :path, String
 
-  delegate :id, to: :navigation_item
-
-  def initialize(navigation_item, translation)
-    @navigation_item = navigation_item
-    @translation = translation
-
-    init_attribute_values(translation)
-  end
-
   def self.model_name
     NavigationItem.model_name
   end
-
-  def persisted?
-    true
-  end
-
-  private
-
-  def save_object
-    init_object_values(@translation)
-    @translation.save
-  end
 end

data/app/forms/backend/page_translation_form.rb

@@ -22,11 +22,9 @@ class Backend::PageTranslationForm < Udongo::Form
     self.title = @translation.title
     self.subtitle = @translation.subtitle
 
-    self.seo_title = @seo.title
-    self.seo_keywords = @seo.keywords
-    self.seo_description = @seo.description
-    self.seo_custom = @seo.custom
-    self.seo_slug = @seo.slug
+    %w(title keywords description custom slug).each do |f|
+      self.send("seo_#{f}=", @seo.send(f))
+    end
   end
 
   def self.model_name
@@ -41,11 +39,9 @@ class Backend::PageTranslationForm < Udongo::Form
     self.title = params[:title]
     self.subtitle = params[:subtitle]
 
-    self.seo_title = params[:seo_title]
-    self.seo_keywords = params[:seo_keywords]
-    self.seo_description = params[:seo_description]
-    self.seo_custom = params[:seo_custom]
-    self.seo_slug = params[:seo_slug]
+    %w(title keywords description custom slug).each do |f|
+      self.send("seo_#{f}=", params["seo_#{f}".to_sym])
+    end
 
     if valid?
       save_object
@@ -60,13 +56,12 @@ class Backend::PageTranslationForm < Udongo::Form
   def save_object
     @translation.title = title
     @translation.subtitle = subtitle
-    @translation.save
-
-    @seo.title = seo_title
-    @seo.keywords = seo_keywords
-    @seo.description = seo_description
-    @seo.custom = seo_custom
-    @seo.slug = seo_slug
-    @seo.save
+
+    %w(title keywords description custom slug).each do |f|
+      @seo.send("#{f}=", send("seo_#{f}"))
+    end
+
+    # Saves the page, translation and SEO info all at once.
+    @page.save
   end
 end

data/app/forms/backend/snippet_translation_form.rb

@@ -1,30 +1,8 @@
-class Backend::SnippetTranslationForm < Udongo::Form
-  attr_reader :snippet, :translation
-
+class Backend::SnippetTranslationForm < Backend::TranslationForm
   attribute :title, String
   attribute :content, String
 
-  delegate :id, to: :snippet
-
-  def initialize(snippet, translation)
-    @snippet = snippet
-    @translation = translation
-
-    init_attribute_values(translation)
-  end
-
   def self.model_name
     Snippet.model_name
   end
-
-  def persisted?
-    true
-  end
-
-  private
-
-  def save_object
-    init_object_values(@translation)
-    @translation.save
-  end
 end

data/app/forms/backend/translation_form.rb

@@ -0,0 +1,22 @@
+class Backend::TranslationForm < Udongo::Form
+  attr_reader :model, :translation
+  delegate :id, to: :model
+
+  def initialize(model, translation)
+    @model = model
+    @translation = translation
+
+    init_attribute_values(@translation)
+  end
+
+  def persisted?
+    true
+  end
+
+  private
+
+  def save_object
+    init_object_values(@translation)
+    @model.save
+  end
+end

data/app/helpers/udongo_helper.rb

@@ -5,10 +5,6 @@ module UdongoHelper
     js_asset_loader.load_js file, target
   end
 
-  def restart_webserver_button
-    link_to I18n.t('b.restart_webserver'), backend_restart_webserver_path, class: 'btn btn-info', method: 'post'
-  end
-
   # Before using: Put <%= yield(:stylesheets) %> in the <head> of your app's frontend
   def stylesheet(file, media = :screen)
     css_asset_loader.view = self

data/app/mailers/general_mailer.rb

@@ -1,13 +1,23 @@
 class GeneralMailer < ActionMailer::Base
   def email(email)
-    from = "#{email.from_name} <#{email.from_email}>"
-    to = "#{email.to_name} <#{email.to_email}>"
-
-    mail(from: from, to: to, subject: email.subject) do |format|
+    mail(headers(email)) do |format|
       format.text { render text: email.plain_content }
       format.html { render html: email.html_content.html_safe }
     end
 
     email.mark_as_sent!
   end
+
+  private
+
+  def headers(email)
+    from = "#{email.from_name} <#{email.from_email}>"
+    to = "#{email.to_name} <#{email.to_email}>"
+
+    {
+      from: from,
+      to: to,
+      subject: email.subject
+    }
+  end
 end

data/app/models/admin.rb

@@ -2,8 +2,8 @@ class Admin < ApplicationRecord
   include Concerns::Person
   has_secure_password
 
-  validates :first_name, :last_name, presence: true
+  validates :locale, :first_name, :last_name, presence: true
   validates :email,
             uniqueness: { case_sensitive: false },
-            format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i }
+            email: true
 end

data/app/models/comment.rb

@@ -11,8 +11,7 @@ class Comment < ApplicationRecord
 
   validates :author, :message, presence: true
   validates :status, inclusion: { in: STATUSES }
-  validates :email, presence: true,
-            format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i }
+  validates :email, presence: true, email: true
   validates :website, url: true, allow_blank: true
 
   def published?

data/app/models/concerns/addressable.rb

@@ -0,0 +1,40 @@
+module Concerns
+  module Addressable
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :addresses, dependent: :destroy
+    end
+
+    module ClassMethods
+      def configure_adress(categories, default: nil)
+        address_config.update(categories, default: default)
+      end
+
+      def address_config
+        @address_config ||= Concerns::Addressable::Config.new
+      end
+    end
+
+    def address(category = nil)
+      category = self.class.address_config.default unless category.present?
+
+      unless self.class.address_config.allowed?(category)
+        raise "You can't select the '#{category}' address because it's not an allowed category"
+      end
+
+      @address_collections = {} unless @address_collections
+
+      unless @address_collections[category.to_sym]
+
+        @address_collections[category.to_sym] = Address.find_or_initialize_by(
+          category: category,
+          addressable_type: self.class.name,
+          addressable_id: id
+        )
+      end
+
+      @address_collections[category.to_sym]
+    end
+  end
+end

data/app/models/concerns/addressable/config.rb

@@ -0,0 +1,33 @@
+module Concerns
+  module Addressable
+    class Config
+      attr_reader :fields, :default
+
+      def initialize
+        @fields = []
+        @default = nil
+      end
+
+      def update(categories, default: nil)
+        unless categories.respond_to?(:each) && categories.any?
+          raise 'Please provide an array with address categories'
+        end
+
+        @fields = categories.map(&:to_sym).uniq
+        @default = @fields.first
+
+        if default
+          unless @fields.include?(default.to_sym)
+            raise "You can't make '#{default.to_s}' the default address category because it's not in the list of categories"
+          end
+
+          @default = default.to_sym
+        end
+      end
+
+      def allowed?(field)
+        @fields.include?(field.to_sym)
+      end
+    end
+  end
+end

data/app/models/concerns/cacheable.rb

@@ -7,7 +7,7 @@ module Concerns
       after_touch :flush_cache
 
       scope :find_in_cache, ->(value) {
-        Rails.cache.fetch [name, value]  do
+        Rails.cache.fetch [name, value] do
           find_by!(@cache_field => value)
         end
       }

data/app/models/email.rb

@@ -1,8 +1,8 @@
 class Email < ApplicationRecord
   validates :from_name, :to_name, :subject, :plain_content, :html_content,
             presence: true
-  validates :from_email, :to_email,
-            format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i }
+  validates :from_email, :to_email, email: true
+  validates :cc, :bcc, email: true, allow_blank: true
 
   scope :sent, -> { where('sent_at IS NOT NULL') }
   scope :not_sent, -> { where('sent_at IS NULL') }

data/app/models/email_template.rb

@@ -6,5 +6,6 @@ class EmailTemplate < ApplicationRecord
 
   validates :description, :from_name, presence: true
   validates :identifier, presence: true, uniqueness: { case_sensitive: false }
-  validates :from_email, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i }
+  validates :from_email, email: true
+  validates :cc, :bcc, email: true, allow_blank: true
 end

data/app/views/backend/_general_form_error.html.erb

@@ -0,0 +1,6 @@
+<% if object.errors.any? %>
+  <div class="alert alert-danger" role="alert">
+    <%= t('b.msg.general_form_error').html_safe %>
+  </div>
+<% end %>
+

data/app/views/backend/admins/_form.html.erb

@@ -1,3 +1,5 @@
+<%= render 'backend/general_form_error', object: @admin %>
+
 <%= simple_form_for [:backend, @admin] do |f| %>
   <div class="row">
     <div class="col-md-6">
@@ -7,6 +9,7 @@
         </div>
 
         <div class="card-block">
+          <%= f.input :locale, collection: Udongo.config.i18n.cms.interface_locales, include_blank: false %>
           <%= f.input :first_name %>
           <%= f.input :last_name %>
           <%= f.input :email, required: true %>

data/app/views/backend/content/rows/columns/_dimension_fields.html.erb

@@ -0,0 +1,3 @@
+<% Udongo::Configs::FlexibleContent::BREAKPOINTS.each do |bp| %>
+  <%= form.input "width_#{bp}", as: :integer, wrapper_html: { hidden: !Udongo.config.flexible_content.allowed_breakpoint?(bp) } %>
+<% end %>

data/app/views/backend/content/rows/columns/edit.html.erb

@@ -1,3 +1,5 @@
+<%= render 'backend/general_form_error', object: @column %>
+
 <%= simple_form_for(@column, url: backend_content_row_column_path(@row, @column)) do |f| %>
   <div class="card">
     <div class="card-header">
@@ -7,11 +9,7 @@
     <div class="card-block">
       <div class="row">
         <div class="col-md-6">
-          <%= f.input :width_xs, as: :integer %>
-          <%= f.input :width_sm, as: :integer %>
-          <%= f.input :width_md, as: :integer %>
-          <%= f.input :width_lg, as: :integer %>
-          <%= f.input :width_xl, as: :integer %>
+          <%= render 'backend/content/rows/columns/dimension_fields', form: f %>
         </div>
 
         <div class="col-md-6">

data/app/views/backend/content/rows/columns/new.html.erb

@@ -1,3 +1,5 @@
+<%= render 'backend/general_form_error', object: @column %>
+
 <%= simple_form_for(@column, url: backend_content_row_columns_path(@row)) do |f| %>
   <div class="card">
     <div class="card-header">
@@ -7,11 +9,7 @@
     <div class="card-block">
       <div class="row">
         <div class="col-md-6">
-          <%= f.input :width_xs, as: :integer %>
-          <%= f.input :width_sm, as: :integer %>
-          <%= f.input :width_md, as: :integer %>
-          <%= f.input :width_lg, as: :integer %>
-          <%= f.input :width_xl, as: :integer %>
+          <%= render 'backend/content/rows/columns/dimension_fields', form: f %>
         </div>
 
         <div class="col-md-6">

data/app/views/backend/content/rows/images/edit.html.erb

@@ -1,3 +1,5 @@
+<%= render 'backend/general_form_error', object: @model %>
+
 <div class="card">
   <div class="card-header">
     <%= t 'b.msg.flexible_content.edit_image' %>

data/app/views/backend/dashboard/show.html.erb

@@ -1 +1 @@
-Dashboard#show
+<!-- Fine me in app/views/backend/dashboard/show.html.erb -->

data/app/views/backend/email_templates/_form.html.erb

@@ -1,27 +1,49 @@
-<%= simple_form_for [:backend, @form] do |f| %>
+<%= render 'backend/general_form_error', object: @model %>
+
+<%= simple_form_for [:backend, @model] do |f| %>
   <div class="row">
-    <div class="col-md-6">
+    <div class="col-md-12">
       <div class="card">
         <div class="card-header">
           <%= t 'b.general' %>
         </div>
 
         <div class="card-block">
-          <%= f.input :identifier %>
-          <%= f.input :description, as: :string %>
+          <div class="row">
+            <div class="col-md-6">
+              <%= f.input :identifier %>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-md-12">
+              <%= f.input :description, as: :string %>
+            </div>
+          </div>
         </div>
       </div>
     </div>
+  </div>
 
-    <div class="col-md-6">
+  <div class="row">
+    <div class="col-md-12">
       <div class="card">
         <div class="card-header">
           <%= t 'b.settings' %>
         </div>
 
         <div class="card-block">
-          <%= f.input :from_name %>
-          <%= f.input :from_email %>
+          <div class="row">
+            <div class="col-md-6">
+              <%= f.input :from_name %>
+              <%= f.input :from_email %>
+            </div>
+
+            <div class="col-md-6">
+              <%= f.input :cc %>
+              <%= f.input :bcc %>
+            </div>
+          </div>
         </div>
       </div>
     </div>