alchemy_cms 5.1.10 → 5.2.0.b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22e0baf2c4ddddb60434bca77764c2d8b7a885cf164a17e5c1ef67f6e0f4a4ba
-  data.tar.gz: e74e655f91a8966bfe636504976c06df51675c24343b3fa606c37ae3f7019741
+  metadata.gz: f2d282ae615eeffe270108252f3979dbad9a1233d280f8834c1b5420afc27929
+  data.tar.gz: '095d174025843dd1c347c17ef6fe9ca93bf80398d6eb33f1d5f6d5c2d1c2e7d4'
 SHA512:
-  metadata.gz: 60e262f8c6f3683ba502ffb9cf07031216021d04c5db3c8743748dea49a499e310f0ee0d98a2bb5c06896510fe7c913a526e791ee82637def10012611706aad3
-  data.tar.gz: 05515f3c002cbaa8a797e156d3e83d296e3fff58e4a01d1c47bd7c61ca9487b34f12c29149e9616c33ef5200e1b491e15bafb101477b361457c6e93603969046
+  metadata.gz: 260ad000c50c5466d49644054541829229f4eebf0bb75e375c25aeffd835a61acfe5fd8d4accf45bc7724c707966fc8501c21f7ee1e080d73e84c1435265d4b0
+  data.tar.gz: '08af0b5dab164cfda123d3d600f486592ffc2f5ac59caf63a4c8b6642cf3febff9371c394adab35811c3c7e0c11601bf0b63e17211906dbd31300e7e9d70964a'

data/.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   RSpec:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
@@ -14,6 +14,7 @@ jobs:
         ruby:
           - '2.5.x'
           - '2.6.x'
+          - '2.7.x'
         database:
           - mysql
           - postgresql

data/CHANGELOG.md

@@ -1,43 +1,35 @@
-## 5.1.10 (2022-02-28)
+## 5.2.0.b1 (2021-02-11)
 
-- Add crop_resize Dragonfly processor ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.1.9 (2021-11-24)
-
-- Adjust tinymce skin assets urls again ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.1.8 (2021-11-17)
-
-- Set stampable user_class_name without root identifier  ([tvdeyen](https://github.com/tvdeyen))
-- Use relative path for tinymce font-face  ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.1.7 (2021-10-26)
-
-- Make sure to install correct npm package ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.1.6 (2021-09-17)
-
-- Use self_and_ancestors in page_active? helper [#2194](https://github.com/AlchemyCMS/alchemy_cms/pull/2194) ([mamhoff](https://github.com/mamhoff))
+### Features
 
-## 5.1.5 (2021-09-15)
+- Allow Element and Content deprecation notices [#1988](https://github.com/AlchemyCMS/alchemy_cms/pull/1988) ([tvdeyen](https://github.com/tvdeyen))
+- Add element definition api (based on PageLayout definitions) [#1986](https://github.com/AlchemyCMS/alchemy_cms/pull/1986) ([stockime](https://github.com/stockime))
 
-- generate picture thumbnails only for pictures with convertible format [#2131](https://github.com/AlchemyCMS/alchemy_cms/pull/2131) ([afdev82](https://github.com/afdev82))
-- Backport #2115 to v5.1 [#2125](https://github.com/AlchemyCMS/alchemy_cms/pull/2125) ([dbwinger](https://github.com/dbwinger))
-- Backport #2114 to v5.1 [#2117](https://github.com/AlchemyCMS/alchemy_cms/pull/2117) ([afdev82](https://github.com/afdev82))
+### Changes
 
-## 5.1.4 (2021-05-13)
+- Fix jpeg quality option for jpeg files [#2016](https://github.com/AlchemyCMS/alchemy_cms/pull/2016) ([kulturbande](https://github.com/kulturbande))
+- Pin Ransack to below 2.4.2 [#2012](https://github.com/AlchemyCMS/alchemy_cms/pull/2012) ([tvdeyen](https://github.com/tvdeyen))
+- Fix setting current_user in integration helper [#2006](https://github.com/AlchemyCMS/alchemy_cms/pull/2006) ([tvdeyen](https://github.com/tvdeyen))
+- Update mime type icons and translations [#2002](https://github.com/AlchemyCMS/alchemy_cms/pull/2002) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate page layout change [#1993](https://github.com/AlchemyCMS/alchemy_cms/pull/1993) ([tvdeyen](https://github.com/tvdeyen))
+- Fix Ruby 2.7 deprecations [#1989](https://github.com/AlchemyCMS/alchemy_cms/pull/1989) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate trash [#1985](https://github.com/AlchemyCMS/alchemy_cms/pull/1985) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate elements fallbacks [#1982](https://github.com/AlchemyCMS/alchemy_cms/pull/1982) ([tvdeyen](https://github.com/tvdeyen))
 
-- Fix alchemy:generate:thumbnails task [#2092](https://github.com/AlchemyCMS/alchemy_cms/pull/2092) ([afdev82](https://github.com/afdev82))
-- Do not attempt to generate thumbs for svg files. [#2090](https://github.com/AlchemyCMS/alchemy_cms/pull/2090) ([oneiros](https://github.com/oneiros))
+### Misc
 
-## 5.1.3 (2021-05-06)
+- Use Ubuntu 18.04 on GH actions [#2018](https://github.com/AlchemyCMS/alchemy_cms/pull/2018) ([tvdeyen](https://github.com/tvdeyen))
+- [ruby - main] Upgrade rubocop to version 1.9.0 [#2011](https://github.com/AlchemyCMS/alchemy_cms/pull/2011) ([depfu](https://github.com/apps/depfu))
+- [ruby - main] Upgrade rubocop to version 1.8.1 [#1999](https://github.com/AlchemyCMS/alchemy_cms/pull/1999) ([depfu](https://github.com/apps/depfu))
+- Update brakeman ignores [#1992](https://github.com/AlchemyCMS/alchemy_cms/pull/1992) ([tvdeyen](https://github.com/tvdeyen))
+- [ruby - main] Upgrade rubocop to version 1.6.1 [#1978](https://github.com/AlchemyCMS/alchemy_cms/pull/1978) ([depfu](https://github.com/apps/depfu))
+- [ruby - main] Upgrade simplecov to version 0.20.0 [#1971](https://github.com/AlchemyCMS/alchemy_cms/pull/1971) ([depfu](https://github.com/apps/depfu))
 
-- Use symbols in polymorphic routes for resources [#2087](https://github.com/AlchemyCMS/alchemy_cms/pull/2087) ([tvdeyen](https://github.com/tvdeyen))
-- Backport #2049 to 5.1 [#2059](https://github.com/AlchemyCMS/alchemy_cms/pull/2059) ([rickythefox](https://github.com/rickythefox))
 ## 5.1.2 (2021-01-26)
 
 - Allow to safe hidden elements [#2007](https://github.com/AlchemyCMS/alchemy_cms/pull/2007) ([tvdeyen](https://github.com/tvdeyen))
 
+
 ## 5.1.1 (2021-01-12)
 
 - Fix copy element feature [#1996](https://github.com/AlchemyCMS/alchemy_cms/pull/1996) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -13,11 +13,6 @@ gem "mysql2", "~> 0.5.1" if ENV["DB"] == "mysql"
 gem "pg", "~> 1.0" if ENV["DB"] == "postgresql"
 
 group :development, :test do
-  # execjs 2.8 removes deprecation warnings but also breaks a number of dependent projects.
-  # in our case the culprit is `handlebars-assets`. The changes between 2.7.0 and 2.8.0 are
-  # minimal, but breaking.
-  gem "execjs", "= 2.7.0"
-
   if ENV["GITHUB_ACTIONS"]
     gem "sassc", "~> 2.4.0" # https://github.com/sass/sassc-ruby/issues/146
   else
@@ -27,7 +22,7 @@ group :development, :test do
     gem "yard"
     gem "redcarpet"
     gem "pry-byebug"
-    gem "rubocop", "~> 1.1.0", require: false
+    gem "rubocop", "~> 1.9.0", require: false
     gem "listen"
     gem "localeapp", "~> 3.0", require: false
     gem "dotenv", "~> 2.2"
@@ -35,5 +30,6 @@ group :development, :test do
     gem "active_record_query_trace", require: false
     gem "rack-mini-profiler", require: false
     gem "rufo", require: false
+    gem "brakeman", require: false
   end
 end

data/alchemy_cms.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.1']
   gem.add_runtime_dependency 'cancancan',                        ['>= 2.1', '< 4.0']
   gem.add_runtime_dependency 'coffee-rails',                     ['>= 4.0', '< 6.0']
-  gem.add_runtime_dependency 'dragonfly',                        ['~> 1.4']
+  gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0', '>= 1.0.7']
   gem.add_runtime_dependency 'dragonfly_svg',                    ['~> 0.0.4']
   gem.add_runtime_dependency 'gutentag',                         ['~> 2.2', '>= 2.2.1']
   gem.add_runtime_dependency 'handlebars_assets',                ['~> 0.23']
@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'originator',                       ['~> 3.1']
   gem.add_runtime_dependency 'non-stupid-digest-assets',         ['~> 1.0.8']
   gem.add_runtime_dependency 'rails',                            ['>= 5.2.0', '< 6.1']
-  gem.add_runtime_dependency 'ransack',                          ['>= 1.8', '< 3.0']
+  gem.add_runtime_dependency 'ransack',                          ['>= 1.8', '< 2.4.2'] # 2.4.2 dropped Ruby 2.5 support in a patch level release
   gem.add_runtime_dependency 'request_store',                    ['~> 1.2']
   gem.add_runtime_dependency 'responders',                       ['>= 2.0', '< 4.0']
   gem.add_runtime_dependency 'sassc-rails',                      ['~> 2.1']
@@ -49,7 +49,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rails-controller-testing',     ['~> 1.0']
   gem.add_development_dependency 'rspec-activemodel-mocks',      ['~> 1.0']
   gem.add_development_dependency 'rspec-rails',                  ['>= 4.0.0.beta2']
-  gem.add_development_dependency 'simplecov',                    ['~> 0.17.1']
+  gem.add_development_dependency 'simplecov',                    ['~> 0.20']
   gem.add_development_dependency 'webdrivers',                   ['~> 4.0']
   gem.add_development_dependency 'webmock',                      ['~> 3.3']
   gem.add_development_dependency 'shoulda-matchers',             ['~> 4.0']

data/app/assets/stylesheets/alchemy/_variables.scss

@@ -145,6 +145,8 @@ $elements-window-min-width: 400px !default;
 $element-header-bg-color: $medium-gray !default;
 $element-header-active-bg-color: $dark-blue !default;
 $element-header-active-color: $white !default;
+$element-header-deprecated-bg-color: rgba(253, 213, 175, 0.25) !default;
+$element-deprecated-border-color: rgb(253, 213, 175) !default;
 $top-menu-height: 75px !default;
 
 $tabs-height: 31px !default;

data/app/assets/stylesheets/alchemy/elements.scss

@@ -170,13 +170,32 @@
     }
   }
 
+  &.deprecated {
+    border-color: $element-deprecated-border-color;
+
+    > .element-header {
+      background-color: $element-header-deprecated-bg-color;
+      background-image: linear-gradient(
+        45deg,
+        $element-header-deprecated-bg-color 25%,
+        $element-header-bg-color 25%,
+        $element-header-bg-color 50%,
+        $element-header-deprecated-bg-color 50%,
+        $element-header-deprecated-bg-color 75%,
+        $element-header-bg-color 75%,
+        $element-header-bg-color 100%
+      );
+      background-size: 28.28px 28.28px;
+    }
+  }
+
   &.selected:not(.is-fixed), &:hover {
     &:not(.hidden) {
       box-shadow: 0 2px 8px rgba(#9b9b9b, 0.75);
     }
   }
 
-  &.selected:not(.is-fixed):not(.folded):not(.dirty):not(.hidden) {
+  &.selected:not(.is-fixed):not(.folded):not(.dirty):not(.hidden):not(.deprecated) {
     > .element-header {
       background-color: $element-header-active-bg-color;
       color: $element-header-active-color;
@@ -670,6 +689,24 @@ select.long {
     }
   }
 
+  &.deprecated {
+    border-radius: $default-border-radius;
+    background-color: $element-header-deprecated-bg-color;
+    background-image: linear-gradient(
+      45deg,
+      $element-header-deprecated-bg-color 25%,
+      $element-header-bg-color 25%,
+      $element-header-bg-color 50%,
+      $element-header-deprecated-bg-color 50%,
+      $element-header-deprecated-bg-color 75%,
+      $element-header-bg-color 75%,
+      $element-header-bg-color 100%
+    );
+    background-size: 28.28px 28.28px;
+    padding-left: 2px;
+    padding-right: 2px;
+  }
+
   label {
     display: block;
     margin: $default-margin 0;
@@ -802,10 +839,6 @@ textarea.has_tinymce {
   }
 }
 
-.element-handle .hint-with-icon {
-  top: -1px;
-}
-
 .is-fixed {
   &.with-contents {
     >.element-footer {

data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss

@@ -30,7 +30,7 @@ td,th {
 
 .mce-object {
   border: 1px dotted #3a3a3a;
-  background: #d5d5d5 url('tinymce/skins/alchemy/fonts/img/object.gif') no-repeat center;
+  background: #d5d5d5 url(img/object.gif) no-repeat center;
 }
 
 .mce-pagebreak {
@@ -55,7 +55,7 @@ td,th {
   width: 9px!important;
   height: 9px!important;
   border: 1px dotted #3a3a3a;
-  background: #d5d5d5 url('tinymce/skins/alchemy/fonts/img/anchor.gif') no-repeat center;
+  background: #d5d5d5 url(img/anchor.gif) no-repeat center;
 }
 
 .mce-nbsp {
@@ -77,7 +77,7 @@ hr {
 }
 
 .mce-spellchecker-word {
-  background: url('tinymce/skins/alchemy/fonts/img/wline.gif') repeat-x bottom left;
+  background: url(img/wline.gif) repeat-x bottom left;
   cursor: default;
 }
 

data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss

@@ -1561,23 +1561,23 @@ i.mce-i-resize {
   opacity: 0.6;
   filter: alpha(opacity=60);
   zoom: 1;
-  background: #fff url('tinymce/skins/alchemy/fonts/img/loader.gif') no-repeat center center;
+  background: #fff url('img/loader.gif') no-repeat center center;
 }
 
 @font-face {
   font-family: 'tinymce';
-  src: url('tinymce/skins/alchemy/fonts/tinymce.woff') format('woff'),
-       url('tinymce/skins/alchemy/fonts/tinymce.ttf') format('truetype'),
-       url('tinymce/skins/alchemy/fonts/tinymce.svg#tinymce') format('svg');
+  src: url('fonts/tinymce.woff') format('woff'),
+       url('fonts/tinymce.ttf') format('truetype'),
+       url('fonts/tinymce.svg#tinymce') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'tinymce-small';
-  src: url('tinymce/skins/alchemy/fonts/tinymce-small.woff') format('woff'),
-       url('tinymce/skins/alchemy/fonts/tinymce-small.ttf') format('truetype'),
-       url('tinymce/skins/alchemy/fonts/tinymce-small.svg#tinymce') format('svg');
+  src: url('fonts/tinymce-small.woff') format('woff'),
+       url('fonts/tinymce-small.ttf') format('truetype'),
+       url('fonts/tinymce-small.svg#tinymce') format('svg');
   font-weight: normal;
   font-style: normal;
 }

data/app/controllers/alchemy/admin/base_controller.rb

@@ -40,7 +40,9 @@ module Alchemy
       def exception_handler(error)
         exception_logger(error)
         show_error_notice(error)
-        notify_error_tracker(error)
+        if defined?(Airbrake)
+          notify_airbrake(error) unless Rails.env.development? || Rails.env.test?
+        end
       end
 
       # Displays an error notice in the Alchemy backend.
@@ -70,6 +72,7 @@ module Alchemy
       def trash_empty?(category)
         "alchemy/#{category.singularize}".classify.constantize.trashed.blank?
       end
+      deprecate :trash_empty?, deprecator: Alchemy::Deprecation
 
       def set_stamper
         if Alchemy.user_class < ActiveRecord::Base
@@ -145,14 +148,6 @@ module Alchemy
             site
           end
       end
-
-      def notify_error_tracker(exception)
-        if ::Alchemy::ErrorTracking.notification_handler.respond_to?(:call)
-          ::Alchemy::ErrorTracking.notification_handler.call(exception)
-        else
-          Rails.logger.warn("To use the Alchemy::ErrorTracking.notification_handler, it must respond to #call.")
-        end
-      end
     end
   end
 end

data/app/controllers/alchemy/admin/trash_controller.rb

@@ -12,12 +12,14 @@ module Alchemy
         @page = Page.find(params[:page_id])
         @allowed_elements = @page.available_element_definitions
       end
+      deprecate :index, deprecator: Alchemy::Deprecation
 
       def clear
         @page = Page.find(params[:page_id])
         @elements = Element.trashed
         @elements.map(&:destroy)
       end
+      deprecate :clear, deprecator: Alchemy::Deprecation
 
       private
 

data/app/decorators/alchemy/content_editor.rb

@@ -12,6 +12,7 @@ module Alchemy
       [
         "content_editor",
         essence_partial_name,
+        deprecated? ? "deprecated" : nil,
       ].compact
     end
 
@@ -51,5 +52,68 @@ module Alchemy
 
       super
     end
+
+    def has_warnings?
+      definition.blank? || deprecated?
+    end
+
+    def warnings
+      return unless has_warnings?
+
+      if definition.blank?
+        Logger.warn("Content #{name} is missing its definition", caller(1..1))
+        Alchemy.t(:content_definition_missing)
+      else
+        deprecation_notice
+      end
+    end
+
+    # Returns a deprecation notice for contents marked deprecated
+    #
+    # You can either use localizations or pass a String as notice
+    # in the content definition.
+    #
+    # == Custom deprecation notices
+    #
+    # Use general content deprecation notice
+    #
+    #     - name: element_name
+    #       contents:
+    #         - name: old_content
+    #           type: EssenceText
+    #           deprecated: true
+    #
+    # Add a translation to your locale file for a per content notice.
+    #
+    #     en:
+    #       alchemy:
+    #         content_deprecation_notices:
+    #           element_name:
+    #             old_content: Foo baz widget is deprecated
+    #
+    # or use the global translation that apply to all deprecated contents.
+    #
+    #     en:
+    #       alchemy:
+    #         content_deprecation_notice: Foo baz widget is deprecated
+    #
+    # or pass string as deprecation notice.
+    #
+    #     - name: element_name
+    #       contents:
+    #         - name: old_content
+    #           type: EssenceText
+    #           deprecated: This content will be removed soon.
+    #
+    def deprecation_notice
+      case definition["deprecated"]
+      when String
+        definition["deprecated"]
+      when TrueClass
+        Alchemy.t(name,
+                  scope: [:content_deprecation_notices, element.name],
+                  default: Alchemy.t(:content_deprecated))
+      end
+    end
   end
 end

data/app/decorators/alchemy/element_editor.rb

@@ -8,17 +8,6 @@ module Alchemy
       "alchemy/admin/elements/element"
     end
 
-    # Returns content editor instances for defined contents
-    #
-    # Creates contents on demand if the content is not yet present on the element
-    #
-    # @return Array<Alchemy::ContentEditor>
-    def contents
-      element.definition.fetch(:contents, []).map do |content|
-        Alchemy::ContentEditor.new(find_or_create_content(content[:name]))
-      end
-    end
-
     # CSS classes for the element editor partial.
     def css_classes
       [
@@ -28,6 +17,7 @@ module Alchemy
         taggable? ? "taggable" : "not-taggable",
         folded ? "folded" : "expanded",
         compact? ? "compact" : nil,
+        deprecated? ? "deprecated" : nil,
         fixed? ? "is-fixed" : "not-fixed",
         public? ? "visible" : "hidden",
       ].join(" ")
@@ -88,19 +78,5 @@ module Alchemy
                   default: Alchemy.t(:element_deprecated))
       end
     end
-
-    private
-
-    def find_or_create_content(name)
-      find_content(name) || create_content(name)
-    end
-
-    def find_content(name)
-      element.contents.find { |content| content.name == name }
-    end
-
-    def create_content(name)
-      Alchemy::Content.create(element: element, name: name)
-    end
   end
 end

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

@@ -19,13 +19,8 @@ module Alchemy
 
         content_name = content.name_for_label
 
-        if content.definition.blank?
-          warning("Content #{content.name} is missing its definition")
-
-          icon = hint_with_tooltip(
-            Alchemy.t(:content_definition_missing),
-          )
-
+        if content.has_warnings?
+          icon = hint_with_tooltip(content.warnings)
           content_name = "#{icon} #{content_name}".html_safe
         end
 
@@ -39,7 +34,7 @@ module Alchemy
       # Renders the label and a remove link for a content.
       def content_label(content)
         content_tag :label, for: content.form_field_id do
-          [render_hint_for(content), render_content_name(content)].compact.join(" ").html_safe
+          [render_content_name(content), render_hint_for(content)].compact.join(" ").html_safe
         end
       end
     end

data/app/helpers/alchemy/elements_helper.rb

@@ -28,22 +28,6 @@ module Alchemy
     #     <%= render_elements from_page: 'footer' %>
     #   </footer>
     #
-    # === Fallback to elements from global page:
-    #
-    # You can use the fallback option as an override for elements that are stored on another page.
-    # So you can take elements from a global page and only if the user adds an element on current page the
-    # local one gets rendered.
-    #
-    # 1. You have to pass the the name of the element the fallback is for as <tt>for</tt> key.
-    # 2. You have to pass a <tt>page_layout</tt> name or {Alchemy::Page} from where the fallback elements is taken from as <tt>from</tt> key.
-    # 3. You can pass the name of element to fallback with as <tt>with</tt> key. This is optional (the element name from the <tt>for</tt> key is taken as default).
-    #
-    #   <%= render_elements(fallback: {
-    #     for: 'contact_teaser',
-    #     from: 'sidebar',
-    #     with: 'contact_teaser'
-    #   }) %>
-    #
     # === Custom elements finder:
     #
     # Having a custom element finder class:
@@ -76,8 +60,6 @@ module Alchemy
     #   The amount of elements to be rendered (begins with first element found)
     # @option options [Number] :offset
     #   The offset to begin loading elements from
-    # @option options [Hash] :fallback
-    #   Define elements that are rendered from another page.
     # @option options [Boolean] :random (false)
     #   Randomize the output of elements
     # @option options [Boolean] :reverse (false)

data/app/helpers/alchemy/pages_helper.rb

@@ -100,7 +100,7 @@ module Alchemy
 
     # Returns true if page is in the active branch
     def page_active?(page)
-      @_page_ancestors ||= @page.self_and_ancestors.contentpages
+      @_page_ancestors ||= Page.ancestors_for(@page)
       @_page_ancestors.include?(page)
     end
 

data/app/models/alchemy/attachment.rb

@@ -28,7 +28,7 @@ module Alchemy
       after_assign { |f| write_attribute(:file_mime_type, f.mime_type) }
     end
 
-    stampable stamper_class_name: Alchemy.user_class.name
+    stampable stamper_class_name: Alchemy.user_class_name
 
     has_many :essence_files, class_name: "Alchemy::EssenceFile", foreign_key: "attachment_id"
     has_many :contents, through: :essence_files
@@ -125,6 +125,10 @@ module Alchemy
         "file-alt"
       when *EXCEL_FILE_TYPES
         "file-excel"
+      when *POWERPOINT_FILE_TYPES
+        "file-powerpoint"
+      when *WORD_FILE_TYPES
+        "file-word"
       when *VCARD_FILE_TYPES
         "address-card"
       when *ARCHIVE_FILE_TYPES

data/app/models/alchemy/content.rb

@@ -46,9 +46,12 @@ module Alchemy
 
     delegate :restricted?, to: :page, allow_nil: true
     delegate :trashed?, to: :element, allow_nil: true
+    deprecate :trashed?, deprecator: Alchemy::Deprecation
     delegate :public?, to: :element, allow_nil: true
 
     class << self
+      deprecate :not_trashed, deprecator: Alchemy::Deprecation
+
       # Returns the translated label for a content name.
       #
       # Translate it in your locale yml file:
@@ -189,6 +192,10 @@ module Alchemy
       essence && !essence.link.blank?
     end
 
+    def deprecated?
+      !!definition["deprecated"]
+    end
+
     # Returns true if this content should be taken for element preview.
     def preview_content?
       !!definition["as_element_title"]

data/app/models/alchemy/element/definitions.rb

@@ -13,41 +13,24 @@ module Alchemy
       # your own set of elements
       #
       def definitions
-        @definitions ||= read_definitions_file.map(&:with_indifferent_access)
+        ElementDefinition.all
       end
 
       # Returns one element definition by given name.
       #
       def definition_by_name(name)
-        definitions.detect { |d| d["name"] == name }
-      end
-
-      private
-
-      # Reads the element definitions file named +elements.yml+ from +config/alchemy/+ folder.
-      #
-      def read_definitions_file
-        if ::File.exist?(definitions_file_path)
-          ::YAML.safe_load(ERB.new(File.read(definitions_file_path)).result, YAML_WHITELIST_CLASSES, [], true) || []
-        else
-          raise LoadError, "Could not find elements.yml file! Please run `rails generate alchemy:install`"
-        end
-      end
-
-      # Returns the +elements.yml+ file path
-      #
-      def definitions_file_path
-        Rails.root.join "config/alchemy/elements.yml"
+        ElementDefinition.get(name)
       end
     end
 
     # The definition of this element.
     #
     def definition
-      if definition = self.class.definitions.detect { |d| d["name"] == name }
+      if definition = self.class.definition_by_name(name)
         definition
       else
-        log_warning "Could not find element definition for #{name}. Please check your elements.yml file!"
+        log_warning "Could not find element definition for #{name}. " \
+                    "Please check your elements.yml file!"
         {}
       end
     end