alchemy_cms 4.0.5 → 4.1.0.beta

data/app/helpers/alchemy/admin/contents_helper.rb

@@ -23,8 +23,7 @@ module Alchemy
           warning("Content #{content.name} is missing its definition")
 
           icon = hint_with_tooltip(
-            Alchemy.t(:content_definition_missing),
-            class: 'inline warning icon'
+            Alchemy.t(:content_definition_missing)
           )
 
           content_name = "#{icon} #{content_name}".html_safe

data/app/helpers/alchemy/admin/elements_helper.rb

@@ -82,16 +82,17 @@ module Alchemy
         options.delete_if { |_c, e| e.blank? }
       end
 
-      def element_array_for_options(e, object_method, cell = nil)
-        if e.class.name == 'Alchemy::Element'
+      def element_array_for_options(element, object_method, cell = nil)
+        case element
+        when Alchemy::Element
           [
-            e.display_name_with_preview_text,
-            e.send(object_method).to_s + (cell ? "##{cell['name']}" : "")
+            element.display_name_with_preview_text,
+            element.send(object_method).to_s + (cell ? "##{cell['name']}" : "")
           ]
         else
           [
-            Element.display_name_for(e['name']),
-            e[object_method] + (cell ? "##{cell['name']}" : "")
+            Element.display_name_for(element['name']),
+            element[object_method] + (cell ? "##{cell['name']}" : "")
           ]
         end
       end

data/app/helpers/alchemy/admin/tags_helper.rb

@@ -16,14 +16,13 @@ module Alchemy
         sorted_tags_from(class_name: class_name).map do |tag|
           content_tag('li', name: tag.name, class: filtered_by_tag?(tag) ? 'active' : nil) do
             link_to(
-              "#{tag.name} (#{tag.count})",
+              "#{tag.name} (#{tag.taggings_count})",
               url_for(
                 search_filter_params.except(:page, :tagged_with).merge(
                   tagged_with: tags_for_filter(current: tag).presence
                 )
               ),
-              remote: request.xhr?,
-              class: 'please_wait'
+              remote: request.xhr?
             )
           end
         end.join.html_safe
@@ -37,7 +36,7 @@ module Alchemy
 
       # Returns the tags from params suitable for the tags filter.
       #
-      # @param current [ActsAsTaggableOn::Tag] - The current tag that will be added or removed if already present
+      # @param current [Gutentag::Tag] - The current tag that will be added or removed if already present
       # @returns [String]
       def tags_for_filter(current:)
         if filtered_by_tag?(current)

data/app/helpers/alchemy/base_helper.rb

@@ -20,9 +20,24 @@ module Alchemy
       end
     end
 
-    # Returns an icon
-    def render_icon(icon_class)
-      content_tag('span', '', class: "icon #{icon_class}")
+    # Render a Fontawesome icon
+    #
+    # @param icon_class [String] Fontawesome icon name
+    # @param size: nil [String] Fontawesome icon size
+    # @param transform: nil [String] Fontawesome transform style
+    #
+    # @return [String]
+    def render_icon(icon_class, options = {})
+      options = {style: 'solid'}.merge(options)
+      classes = [
+        "icon fa-fw",
+        "fa-#{icon_class}",
+        "fa#{options[:style].first}",
+        options[:size] ? "fa-#{options[:size]}" : nil,
+        options[:transform] ? "fa-#{options[:transform]}" : nil,
+        options[:class]
+      ].compact
+      content_tag('i', nil, class: classes)
     end
 
     # Returns a div with an icon and the passed content
@@ -36,10 +51,11 @@ module Alchemy
     #   <% end %>
     #
     def render_message(type = :info, msg = nil, &blk)
+      icon_class = message_icon_class(type)
       if block_given?
-        content_tag :div, render_icon(type) + capture(&blk), class: "#{type} message"
+        content_tag :div, render_icon(icon_class) + capture(&blk), class: "#{type} message"
       else
-        content_tag :div, render_icon(type) + msg, class: "#{type} message"
+        content_tag :div, render_icon(icon_class) + msg, class: "#{type} message"
       end
     end
 
@@ -66,5 +82,19 @@ module Alchemy
         page
       end
     end
+
+    # Returns the FontAwesome icon name for given message type
+    #
+    # @param message_type [String] The message type. One of +warning+, +info+, +notice+, +error+
+    # @return [String] The FontAwesome icon name
+    def message_icon_class(message_type)
+      case message_type.to_s
+      when 'warning', 'warn', 'alert' then 'exclamation'
+      when 'notice' then 'check'
+      when 'error' then 'bug'
+      else
+        message_type
+      end
+    end
   end
 end

data/app/helpers/alchemy/elements_helper.rb

@@ -198,7 +198,7 @@ module Alchemy
     # Returns a hash containing the HTML tag attributes required for preview mode.
     def element_preview_code_attributes(element)
       return {} unless element.present? && @preview_mode && element.page == @page
-      { :'data-alchemy-element' => element.id }
+      { 'data-alchemy-element' => element.id }
     end
 
     # Returns the element's tags information as a string. Parameters and options
@@ -235,7 +235,7 @@ module Alchemy
       }.merge(options)
 
       return {} if !element.taggable? || element.tag_list.blank?
-      { :'data-element-tags' => options[:formatter].call(element.tag_list) }
+      { 'data-element-tags' => options[:formatter].call(element.tag_list) }
     end
 
     # Sort given elements by content.

data/app/helpers/alchemy/pages_helper.rb

@@ -69,7 +69,7 @@ module Alchemy
       render current_alchemy_site
     rescue ActionView::MissingTemplate
       warning("Site layout for #{current_alchemy_site.try(:name)} not found. Please run `rails g alchemy:site_layouts`")
-      return ""
+      ""
     end
 
     # Renders the navigation.
@@ -269,6 +269,7 @@ module Alchemy
       return "" if @page.title.blank?
       options = {
         prefix: "",
+        suffix: "",
         separator: ""
       }.update(options)
       title_parts = [options[:prefix]]
@@ -277,7 +278,8 @@ module Alchemy
       else
         title_parts << response.status
       end
-      title_parts.join(options[:separator]).html_safe
+      title_parts << options[:suffix]
+      title_parts.reject(&:blank?).join(options[:separator]).html_safe
     end
 
     def meta_description

data/app/models/alchemy/attachment.rb

@@ -18,12 +18,11 @@
 #
 
 module Alchemy
-  class Attachment < ActiveRecord::Base
+  class Attachment < BaseRecord
     include Alchemy::Filetypes
     include Alchemy::NameConversions
-    include Alchemy::Touching
-
-    acts_as_taggable
+    include Alchemy::Taggable
+    include Alchemy::ContentTouching
 
     dragonfly_accessor :file, app: :alchemy_attachments do
       after_assign { |f| write_attribute(:file_mime_type, f.mime_type) }
@@ -64,8 +63,6 @@ module Alchemy
 
     before_save :set_name, if: :file_name_changed?
 
-    after_update :touch_contents
-
     scope :with_file_type, ->(file_type) { where(file_mime_type: file_type) }
 
     # Instance methods
@@ -98,30 +95,24 @@ module Alchemy
     #
     def icon_css_class
       case file_mime_type
-      when "application/x-shockwave-flash"
-        then "flash"
-      when "image/x-psd"
-        then "psd"
-      when "text/plain"
-        then "text"
-      when "application/rtf"
-        then "rtf"
       when "application/pdf"
-        then "pdf"
+        then "file-pdf"
       when "application/msword"
-        then "word"
-      when "application/vnd.ms-excel"
-        then "excel"
+        then "file-word"
+      when *TEXT_FILE_TYPES
+        then "file-alt"
+      when *EXCEL_FILE_TYPES
+        then "file-excel"
       when *VCARD_FILE_TYPES
-        then "vcard"
+        then "address-card"
       when *ARCHIVE_FILE_TYPES
-        then "archive"
+        then "file-archive"
       when *AUDIO_FILE_TYPES
-        then "audio"
+        then "file-audio"
       when *IMAGE_FILE_TYPES
-        then "image"
+        then "file-image"
       when *VIDEO_FILE_TYPES
-        then "video"
+        then "file-video"
       else
         "file"
       end

data/app/models/alchemy/base_record.rb

@@ -0,0 +1,13 @@
+module Alchemy
+  def self.table_name_prefix
+    'alchemy_'
+  end
+
+  class BaseRecord < ActiveRecord::Base
+    self.abstract_class = true
+
+    def active_record_5_1?
+      ActiveRecord.gem_version >= Gem::Version.new('5.1.0')
+    end
+  end
+end

data/app/models/alchemy/cell.rb

@@ -24,7 +24,7 @@
 # Views for cells are inside the +app/views/cells+ folder in your project.
 #
 module Alchemy
-  class Cell < ActiveRecord::Base
+  class Cell < BaseRecord
     include Alchemy::Logger
 
     belongs_to :page, required: true

data/app/models/alchemy/content.rb

@@ -17,9 +17,8 @@
 #
 
 module Alchemy
-  class Content < ActiveRecord::Base
+  class Content < BaseRecord
     include Alchemy::Logger
-    include Alchemy::Touching
     include Alchemy::Hints
 
     # Concerns

data/app/models/alchemy/content/factory.rb

@@ -129,7 +129,7 @@ module Alchemy
       rescue NameError
         false
       end
-    end # end class methods
+    end
 
     # Instance Methods
 

data/app/models/alchemy/element.rb

@@ -21,9 +21,9 @@
 #
 
 module Alchemy
-  class Element < ActiveRecord::Base
+  class Element < BaseRecord
     include Alchemy::Logger
-    include Alchemy::Touching
+    include Alchemy::Taggable
     include Alchemy::Hints
 
     FORBIDDEN_DEFINITION_ATTRIBUTES = [
@@ -46,8 +46,6 @@ module Alchemy
       "updater_id"
     ].freeze
 
-    acts_as_taggable
-
     # All Elements that share the same page id, cell id and parent element id are considered a list.
     #
     # If cell id and parent element id are nil (typical case for a simple page),
@@ -71,8 +69,8 @@ module Alchemy
       foreign_key: :parent_element_id,
       dependent: :destroy
 
-    belongs_to :cell, required: false
-    belongs_to :page, required: true
+    belongs_to :cell, required: false, touch: true
+    belongs_to :page, required: true, touch: true
 
     # A nested element belongs to a parent element.
     belongs_to :parent_element,
@@ -90,8 +88,7 @@ module Alchemy
     attr_accessor :create_contents_after_create
 
     after_create :create_contents, unless: proc { |e| e.create_contents_after_create == false }
-    after_update :touch_pages
-    after_update :touch_cell, unless: -> { cell.nil? }
+    after_update :touch_touchable_pages
 
     scope :trashed,           -> { where(position: nil).order('updated_at DESC') }
     scope :not_trashed,       -> { where(Element.arel_table[:position].not_eq(nil)) }
@@ -105,6 +102,7 @@ module Alchemy
     scope :from_current_site, -> { where(Language.table_name => {site_id: Site.current || Site.default}).joins(page: 'language') }
     scope :folded,            -> { where(folded: true) }
     scope :expanded,          -> { where(folded: false) }
+    scope :not_nested,        -> { where(parent_element_id: nil) }
 
     delegate :restricted?, to: :page, allow_nil: true
 
@@ -327,13 +325,13 @@ module Alchemy
       available_page_cells(page).collect(&:name).uniq
     end
 
-    # If element has a +cell+ associated,
-    # it updates it's timestamp.
+    # Updates all +touchable_pages+
     #
     # Called after_update
     #
-    def touch_cell
-      cell.touch
+    def touch_touchable_pages
+      return unless respond_to?(:touchable_pages)
+      touchable_pages.each(&:touch)
     end
   end
 end

data/app/models/alchemy/essence_boolean.rb

@@ -15,7 +15,7 @@
 # Stores boolean values.
 # Provides a checkbox in the editor views.
 module Alchemy
-  class EssenceBoolean < ActiveRecord::Base
+  class EssenceBoolean < BaseRecord
     acts_as_essence ingredient_column: 'value'
   end
 end

data/app/models/alchemy/essence_date.rb

@@ -13,13 +13,13 @@
 #
 
 module Alchemy
-  class EssenceDate < ActiveRecord::Base
+  class EssenceDate < BaseRecord
     acts_as_essence ingredient_column: 'date'
 
     # Returns self.date for the Element#preview_text method.
     def preview_text(_maxlength = nil)
       return "" if date.blank?
-      ::I18n.l(date, format: :date)
+      ::I18n.l(date, format: :'alchemy.essence_date')
     end
   end
 end

data/app/models/alchemy/essence_file.rb

@@ -16,7 +16,7 @@
 #
 
 module Alchemy
-  class EssenceFile < ActiveRecord::Base
+  class EssenceFile < BaseRecord
     belongs_to :attachment, required: false
     acts_as_essence ingredient_column: 'attachment'
 

data/app/models/alchemy/essence_html.rb

@@ -13,7 +13,7 @@
 #
 
 module Alchemy
-  class EssenceHtml < ActiveRecord::Base
+  class EssenceHtml < BaseRecord
     acts_as_essence ingredient_column: 'source'
 
     # Returns the first x (default = 30) (HTML escaped) characters from self.source for the Element#preview_text method.

data/app/models/alchemy/essence_link.rb

@@ -16,7 +16,7 @@
 #
 
 module Alchemy
-  class EssenceLink < ActiveRecord::Base
+  class EssenceLink < BaseRecord
     acts_as_essence ingredient_column: 'link'
   end
 end

data/app/models/alchemy/essence_picture.rb

@@ -24,7 +24,7 @@
 #
 
 module Alchemy
-  class EssencePicture < ActiveRecord::Base
+  class EssencePicture < BaseRecord
     acts_as_essence ingredient_column: 'picture'
 
     belongs_to :picture, required: false

data/app/models/alchemy/essence_richtext.rb

@@ -15,7 +15,7 @@
 #
 
 module Alchemy
-  class EssenceRichtext < ActiveRecord::Base
+  class EssenceRichtext < BaseRecord
     acts_as_essence preview_text_column: 'stripped_body'
 
     before_save :strip_content

data/app/models/alchemy/essence_select.rb

@@ -14,7 +14,7 @@
 
 # Provides a select box that stores string values.
 module Alchemy
-  class EssenceSelect < ActiveRecord::Base
+  class EssenceSelect < BaseRecord
     acts_as_essence ingredient_column: 'value'
   end
 end

data/app/models/alchemy/essence_text.rb

@@ -18,7 +18,7 @@
 #
 
 module Alchemy
-  class EssenceText < ActiveRecord::Base
+  class EssenceText < BaseRecord
     acts_as_essence
   end
 end

data/app/models/alchemy/folded_page.rb

@@ -11,7 +11,7 @@
 #
 
 module Alchemy
-  class FoldedPage < ActiveRecord::Base
+  class FoldedPage < BaseRecord
     belongs_to :page, required: true
     belongs_to :user, required: true,
       class_name: Alchemy.user_class_name