alchemy_cms 4.0.5 → 4.1.0.beta

data/app/models/alchemy/language.rb

@@ -21,7 +21,7 @@
 #
 
 module Alchemy
-  class Language < ActiveRecord::Base
+  class Language < BaseRecord
     belongs_to :site, required: true
     has_many :pages
 
@@ -47,10 +47,10 @@ module Alchemy
       if: -> { default_changed? && self != Language.default }
 
     after_update :set_pages_language,
-      if: -> { language_code_changed? || country_code_changed? }
+      if: :should_set_pages_language?
 
     after_update :unpublish_pages,
-      if: -> { changes[:public] == [true, false] }
+      if: :should_unpublish_pages?
 
     before_destroy :check_for_default
     after_destroy :delete_language_root_page
@@ -62,8 +62,8 @@ module Alchemy
 
     class << self
       # Store the current language in the current thread.
-      def current=(v)
-        RequestStore.store[:alchemy_current_language] = v
+      def current=(language)
+        RequestStore.store[:alchemy_current_language] = language
       end
 
       # Current language from current thread or default.
@@ -153,6 +153,14 @@ module Alchemy
       lang.save(validate: false)
     end
 
+    def should_set_pages_language?
+      if active_record_5_1?
+        saved_change_to_language_code? || saved_change_to_country_code?
+      else
+        language_code_changed? || country_code_changed?
+      end
+    end
+
     def set_pages_language
       pages.update_all language_code: code
     end
@@ -165,6 +173,14 @@ module Alchemy
       root_page.try(:destroy) && layout_root_page.try(:destroy)
     end
 
+    def should_unpublish_pages?
+      if active_record_5_1?
+        saved_changes[:public] == [true, false]
+      else
+        changes[:public] == [true, false]
+      end
+    end
+
     def unpublish_pages
       pages.update_all(public_on: nil, public_until: nil)
     end

data/app/models/alchemy/page.rb

@@ -37,10 +37,10 @@
 #
 
 module Alchemy
-  class Page < ActiveRecord::Base
+  class Page < BaseRecord
     include Alchemy::Hints
     include Alchemy::Logger
-    include Alchemy::Touching
+    include Alchemy::Taggable
 
     DEFAULT_ATTRIBUTES_FOR_COPY = {
       do_not_autogenerate: true,
@@ -82,7 +82,6 @@ module Alchemy
       :layoutpage
     ]
 
-    acts_as_taggable
     acts_as_nested_set(dependent: :destroy)
 
     stampable stamper_class_name: Alchemy.user_class_name
@@ -123,7 +122,7 @@ module Alchemy
       unless: :systempage?
 
     after_update :create_legacy_url,
-      if: :urlname_changed?,
+      if: :should_create_legacy_url?,
       unless: :redirects_to_external?
 
     # Concerns
@@ -483,9 +482,22 @@ module Alchemy
       self.language_code = language.code
     end
 
+    def should_create_legacy_url?
+      if active_record_5_1?
+        saved_change_to_urlname?
+      else
+        urlname_changed?
+      end
+    end
+
     # Stores the old urlname in a LegacyPageUrl
     def create_legacy_url
-      legacy_urls.find_or_create_by(urlname: urlname_was)
+      if active_record_5_1?
+        former_urlname = urlname_before_last_save
+      else
+        former_urlname = urlname_was
+      end
+      legacy_urls.find_or_create_by(urlname: former_urlname)
     end
 
     def set_published_at

data/app/models/alchemy/page/page_elements.rb

@@ -24,8 +24,12 @@ module Alchemy
         join_table: ElementToPage.table_name
 
       after_create :autogenerate_elements, unless: -> { systempage? || do_not_autogenerate }
-      after_update :trash_not_allowed_elements!, if: :page_layout_changed?
-      after_update :autogenerate_elements, if: :page_layout_changed?
+
+      after_update :trash_not_allowed_elements!,
+        if: :has_page_layout_changed?
+
+      after_update :autogenerate_elements,
+        if: :has_page_layout_changed?
     end
 
     module ClassMethods
@@ -276,6 +280,14 @@ module Alchemy
       not_allowed_elements.to_a.map(&:trash!)
     end
 
+    def has_page_layout_changed?
+      if active_record_5_1?
+        saved_change_to_page_layout?
+      else
+        page_layout_changed?
+      end
+    end
+
     # Deletes unique and already present definitions from @_element_definitions.
     #
     def delete_unique_element_definitions!

data/app/models/alchemy/page/page_naming.rb

@@ -14,17 +14,21 @@ module Alchemy
       validates :name,
         presence: true
       validates :urlname,
-        uniqueness: {scope: [:language_id, :layoutpage], if: 'urlname.present?'},
+        uniqueness: {scope: [:language_id, :layoutpage], if: -> { urlname.present? }},
         exclusion:  {in: RESERVED_URLNAMES},
-        length:     {minimum: 3, if: 'urlname.present?'},
+        length:     {minimum: 3, if: -> { urlname.present? }},
         format:     {with: /\A[:\.\w\-+_\/\?&%;=]*\z/, if: :redirects_to_external?}
       validates :urlname,
         on: :update,
         presence: {if: :redirects_to_external?}
 
-      before_save :set_title, if: 'title.blank?', unless: proc { systempage? || redirects_to_external? }
+      before_save :set_title,
+        unless: -> { systempage? || redirects_to_external? },
+        if: -> { title.blank? }
+
       after_update :update_descendants_urlnames,
-        if: -> { Config.get(:url_nesting) && (urlname_changed? || visible_changed?) }
+        if: :should_update_descendants_urlnames?
+
       after_move :update_urlname!,
         if: -> { Config.get(:url_nesting) },
         unless: :redirects_to_external?
@@ -70,6 +74,15 @@ module Alchemy
 
     private
 
+    def should_update_descendants_urlnames?
+      return false if !Config.get(:url_nesting)
+      if active_record_5_1?
+        saved_change_to_urlname? || saved_change_to_visible?
+      else
+        urlname_changed? || visible_changed?
+      end
+    end
+
     def update_descendants_urlnames
       reload
       descendants.each do |descendant|

data/app/models/alchemy/picture.rb

@@ -21,11 +21,12 @@
 #
 
 module Alchemy
-  class Picture < ActiveRecord::Base
+  class Picture < BaseRecord
     CONVERTIBLE_FILE_FORMATS = %w(gif jpg jpeg png).freeze
 
     include Alchemy::NameConversions
-    include Alchemy::Touching
+    include Alchemy::Taggable
+    include Alchemy::ContentTouching
     include Alchemy::Picture::Transformations
     include Alchemy::Picture::Url
 
@@ -69,8 +70,6 @@ module Alchemy
       case_sensitive: false,
       message: Alchemy.t("not a valid image")
 
-    acts_as_taggable
-
     stampable stamper_class_name: Alchemy.user_class_name
 
     scope :named, ->(name) {
@@ -86,11 +85,9 @@ module Alchemy
     }
 
     scope :without_tag, -> {
-      where("#{table_name}.cached_tag_list IS NULL OR #{table_name}.cached_tag_list = ''")
+      left_outer_joins(:taggings).where(gutentag_taggings: {id: nil})
     }
 
-    after_update :touch_contents
-
     # Class methods
 
     class << self

data/app/models/alchemy/site.rb

@@ -15,7 +15,7 @@
 #
 
 module Alchemy
-  class Site < ActiveRecord::Base
+  class Site < BaseRecord
     # validations
     validates_presence_of :host
     validates_uniqueness_of :host
@@ -55,8 +55,8 @@ module Alchemy
     end
 
     class << self
-      def current=(v)
-        RequestStore.store[:alchemy_current_site] = v
+      def current=(site)
+        RequestStore.store[:alchemy_current_site] = site
       end
 
       def current

data/app/models/alchemy/tag.rb

@@ -2,7 +2,7 @@
 
 # == Schema Information
 #
-# Table name: tags
+# Table name: gutentag_tags
 #
 #  id             :integer          not null, primary key
 #  name           :string
@@ -10,9 +10,9 @@
 #
 
 # Just holds some useful tag methods.
-# The original Tag model is ActsAsTaggableOn::Tag
+# The original Tag model is Gutentag::Tag
 module Alchemy
-  class Tag < ActsAsTaggableOn::Tag
+  class Tag < Gutentag::Tag
     # Replaces tag with new tag on all models tagged with tag.
     def self.replace(tag, new_tag)
       tag.taggings.collect(&:taggable).each do |taggable|

data/app/models/concerns/alchemy/content_touching.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module ContentTouching
+    def self.included(base)
+      base.after_update(:touch_contents)
+    end
+
+    private
+
+    # If the model has a +contents+ association,
+    # it updates all their timestamps.
+    #
+    # CAUTION: Only use on bottom to top releations,
+    # e.g. +Alchemy::Picture+ or +Alchemy::Attachment+
+    # not on top to bottom ones like +Alchemy::Element+.
+    #
+    def touch_contents
+      return unless respond_to?(:contents)
+      contents.each(&:touch)
+    end
+  end
+end

data/app/serializers/alchemy/element_serializer.rb

@@ -15,6 +15,8 @@ module Alchemy
       :ingredients,
       :content_ids
 
+    has_many :nested_elements
+
     def ingredients
       object.contents.collect(&:serialize)
     end

data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb

@@ -14,7 +14,7 @@
   <%= render 'alchemy/admin/partials/remote_search_form' %>
 </div>
 
-<div id="assign_file_list" class="with_padding<%= params[:tagged_with].present? ? ' filtered' : '' %>">
+<div id="assign_file_list" class="with_padding<%= search_filter_params[:tagged_with].present? ? ' filtered' : '' %>">
   <div id="library_sidebar">
     <%= render 'filter_bar' %>
 

data/app/views/alchemy/admin/attachments/_attachment.html.erb

@@ -1,6 +1,6 @@
 <tr class="<%= cycle('even', 'odd') %>">
   <td class="icon">
-    <%= render_icon attachment.icon_css_class %>
+    <%= render_icon attachment.icon_css_class, style: 'regular', size: 'lg' %>
   </td>
   <td class="name">
   <% if can?(:show, attachment) %>
@@ -22,11 +22,11 @@
   <td class="file_name"><%= attachment.file_name %></td>
   <td class="file_type"><%= mime_to_human(attachment.file_mime_type) %></td>
   <td class="file_size"><%= number_to_human_size(attachment.file_size) %></td>
-  <td class="date"><%= l(attachment.created_at, format: :default) %></td>
+  <td class="date"><%= l(attachment.created_at, format: :'alchemy.default') %></td>
   <td class="tools long">
   <% if can?(:show, attachment) %>
     <%= link_to_dialog(
-      render_icon(:info),
+      render_icon('info-circle'),
       alchemy.admin_attachment_path(attachment),
       {
         title: attachment.name,
@@ -38,13 +38,10 @@
     ) %>
   <% end %>
   <% if can?(:download, attachment) %>
-    <%= link_to(
-      "",
+    <%= link_to render_icon(:download),
       alchemy.download_admin_attachment_path(attachment),
       title: Alchemy.t("download_file", filename: attachment.file_name),
-      class: "icon file_download",
-      target: "_blank"
-    ) %>
+      target: "_blank" %>
   <% end %>
   <% if can?(:edit, attachment) %>
     <%= render 'alchemy/admin/attachments/replace_button',
@@ -53,31 +50,24 @@
       file_attribute: 'file' %>
   <% end %>
   <% if can?(:destroy, attachment) %>
-    <%= link_to_confirm_dialog(
-      "",
+    <%= link_to_confirm_dialog render_icon(:minus),
       Alchemy.t(:confirm_to_delete_file),
       alchemy.admin_attachment_path(
         id: attachment,
-        q: params[:q],
+        q: search_filter_params[:q],
         page: params[:page],
         per_page: params[:per_page]
       ),
-      {
-        class: 'icon file_delete',
-        title: Alchemy.t(:delete_file)
-      }
-    ) %>
+      title: Alchemy.t(:delete_file) %>
   <% end %>
   <% if can?(:edit, attachment) %>
-    <%= link_to_dialog("",
-      alchemy.edit_admin_attachment_path(attachment, q: params[:q], page: params[:page]),
+    <%= link_to_dialog render_icon(:edit),
+      alchemy.edit_admin_attachment_path(attachment, q: search_filter_params[:q], page: params[:page]),
       {
         title: Alchemy.t(:rename_file),
         size: '500x250'
       },
-      class: 'icon file_edit',
-      title: Alchemy.t(:rename_file)
-    ) %>
+      title: Alchemy.t(:rename_file) %>
   <% end %>
   </td>
 </tr>

data/app/views/alchemy/admin/attachments/_files_list.html.erb

@@ -1,31 +1,28 @@
-<% if @attachments.blank? && params[:q].blank? %>
-<div class="info" id="no_files_notice">
-  <%= render_icon('info') %>
-  <%= Alchemy.t(:no_files_in_archive) %>
-</div>
-<% elsif @attachments.blank? %>
-<div class="info">
-  <%= render_icon('info') %>
-  <%= Alchemy.t(:no_search_results) %>
-</div>
-<% end %>
-<table id="all_files" class="list">
-  <% unless @attachments.blank? %>
-  <thead>
-    <tr>
-      <th class="icon"></th>
-      <th class="name"><%= sort_link(@query, :name, hide_indicator: true) %></th>
-      <th class="file_name"><%= sort_link(@query, :file_name, hide_indicator: true) %></th>
-      <th class="file_type"><%= Alchemy::Attachment.human_attribute_name('file_mime_type') %></th>
-      <th class="file_size"><%= sort_link(@query, :file_size, hide_indicator: true) %></th>
-      <th class="date"><%= sort_link(@query, :created_at, hide_indicator: true) %></th>
-      <th class="tools"></th>
-    </tr>
-  </thead>
+<% if @attachments.empty? %>
+  <%= render_message do %>
+    <% if search_filter_params[:q].present? %>
+      <%= Alchemy.t(:no_search_results) %>
+    <% else %>
+      <%= Alchemy.t(:no_files_in_archive) %>
+    <% end %>
   <% end %>
-  <tbody>
-    <%= render partial: 'alchemy/admin/attachments/attachment', collection: @attachments %>
-  </tbody>
-</table>
+<% else %>
+  <table id="all_files" class="list">
+    <thead>
+      <tr>
+        <th class="icon"></th>
+        <th class="name"><%= sort_link(@query, :name, hide_indicator: true) %></th>
+        <th class="file_name"><%= sort_link(@query, :file_name, hide_indicator: true) %></th>
+        <th class="file_type"><%= Alchemy::Attachment.human_attribute_name('file_mime_type') %></th>
+        <th class="file_size"><%= sort_link(@query, :file_size, hide_indicator: true) %></th>
+        <th class="date"><%= sort_link(@query, :created_at, hide_indicator: true) %></th>
+        <th class="tools"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render partial: 'alchemy/admin/attachments/attachment', collection: @attachments %>
+    </tbody>
+  </table>
 
-<%= paginate @attachments, theme: 'alchemy' %>
+  <%= paginate @attachments, theme: 'alchemy' %>
+<% end %>

data/app/views/alchemy/admin/attachments/_filter_bar.html.erb

@@ -4,7 +4,7 @@
     'file_type_filter',
     options_for_select(
       Alchemy::Attachment.file_types_for_select,
-      params[:file_type]
+      search_filter_params[:file_type]
     ),
     include_blank: Alchemy.t('Show all files'),
     data: { remote: !!request.xhr? },
@@ -20,9 +20,8 @@
       if ($this.data('remote') === true) {
         $.get(url, {file_type: $this.val()}, null, 'script');
       } else {
-        Alchemy.pleaseWaitOverlay();
         delimiter = url.match(/\?/) ? '&' : '?';
-        window.location = url + delimiter + 'file_type=' + encodeURIComponent($this.val());
+        Turbolinks.visit(url + delimiter + 'file_type=' + encodeURIComponent($this.val()));
       }
       return false;
     });