alchemy_cms 4.2.4 → 4.3.0

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

@@ -16,5 +16,9 @@
 
   .collapsed-menu.elements-window-visible & {
     width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-width});
+
+    @media screen and (min-width: $large-screen-break-point) {
+      max-width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-min-width});
+    }
   }
 }

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

@@ -8,8 +8,8 @@ module Alchemy
 
       def index
         @page = Page.find(params[:page_id])
-        @elements = @page.elements
-        @fixed_elements = @page.fixed_elements
+        @elements = @page.all_elements.not_nested.unfixed.not_trashed
+        @fixed_elements = @page.all_elements.fixed.not_trashed
       end
 
       def list

data/app/controllers/alchemy/pages_controller.rb

@@ -155,10 +155,10 @@ module Alchemy
     end
 
     def set_expiration_headers
-      if @page.cache_page?
-        expires_in @page.expiration_time, public: !@page.restricted, must_revalidate: true
-      else
+      if must_not_cache?
         expires_now
+      else
+        expires_in @page.expiration_time, public: !@page.restricted, must_revalidate: true
       end
     end
 
@@ -190,12 +190,17 @@ module Alchemy
     # or the cache is stale, because it's been republished by the user.
     #
     def render_fresh_page?
-      !@page.cache_page? || stale?(etag: page_etag,
+      must_not_cache? || stale?(etag: page_etag,
         last_modified: @page.published_at,
         public: !@page.restricted,
         template: 'pages/show')
     end
 
+    # don't cache pages if we have flash message to display or the page has caching disabled
+    def must_not_cache?
+      flash.present? || !@page.cache_page?
+    end
+
     def page_not_found!
       not_found_error!("Alchemy::Page not found \"#{request.fullpath}\"")
     end

data/app/helpers/alchemy/elements_helper.rb

@@ -51,7 +51,7 @@ module Alchemy
     #
     #   class MyCustomNewsArchive
     #     def elements(page:)
-    #       news_page.elements.available.named('news').order(created_at: :desc)
+    #       news_page.elements.named('news').order(created_at: :desc)
     #     end
     #
     #     private
@@ -102,7 +102,7 @@ module Alchemy
 
       if options[:from_cell]
         Alchemy::Deprecation.warn "options[:from_cell] has been removed without replacement. " \
-          "Please `render element.nested_elements.available` instead."
+          "Please `render element.nested_elements` instead."
       end
 
       finder = options[:finder] || Alchemy::ElementsFinder.new(options)

data/app/models/alchemy/element.rb

@@ -63,14 +63,19 @@ module Alchemy
     # In order to get contents in creation order we also order them by id.
     has_many :contents, -> { order(:position, :id) }, dependent: :destroy
 
-    # Elements can have other elements nested inside
+    has_many :all_nested_elements,
+      -> { order(:position) },
+      class_name: 'Alchemy::Element',
+      foreign_key: :parent_element_id,
+      dependent: :destroy
+
     has_many :nested_elements,
-      -> { order(:position).not_trashed },
+      -> { order(:position).available },
       class_name: 'Alchemy::Element',
       foreign_key: :parent_element_id,
       dependent: :destroy
 
-    belongs_to :page, touch: true, inverse_of: :descendent_elements
+    belongs_to :page, touch: true, inverse_of: :all_elements
 
     # A nested element belongs to a parent element.
     belongs_to :parent_element,
@@ -98,7 +103,7 @@ module Alchemy
     scope :not_restricted,    -> { joins(:page).merge(Page.not_restricted) }
     scope :available,         -> { published.not_trashed }
     scope :named,             ->(names) { where(name: names) }
-    scope :excluded,          ->(names) { where(arel_table[:name].not_in(names)) }
+    scope :excluded,          ->(names) { where.not(name: names) }
     scope :fixed,             -> { where(fixed: true) }
     scope :unfixed,           -> { where(fixed: false) }
     scope :from_current_site, -> { where(Language.table_name => {site_id: Site.current || Site.default}).joins(page: 'language') }

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

@@ -7,26 +7,19 @@ module Alchemy
     included do
       attr_accessor :autogenerate_elements
 
-      has_many :elements,
-        -> { order(:position).not_nested.unfixed.not_trashed },
+      has_many :all_elements,
+        -> { order(:position) },
         class_name: 'Alchemy::Element'
-      has_many :elements_including_fixed,
-        -> { order(:position).not_nested.not_trashed },
+      has_many :elements,
+        -> { order(:position).not_nested.unfixed.available },
         class_name: 'Alchemy::Element'
       has_many :trashed_elements,
         -> { Element.trashed.order(:position) },
         class_name: 'Alchemy::Element'
       has_many :fixed_elements,
-        -> { order(:position).fixed.not_trashed },
-        class_name: 'Alchemy::Element'
-      has_many :descendent_elements,
-        -> { order(:position).unfixed.not_trashed },
+        -> { order(:position).fixed.available },
         class_name: 'Alchemy::Element'
       has_many :contents, through: :elements
-      has_many :descendent_contents,
-        through: :descendent_elements,
-        class_name: 'Alchemy::Content',
-        source: :contents
       has_and_belongs_to_many :to_be_swept_elements, -> { distinct },
         class_name: 'Alchemy::Element',
         join_table: ElementToPage.table_name
@@ -49,15 +42,12 @@ module Alchemy
       # @return [Array]
       #
       def copy_elements(source, target)
-        new_elements = []
-        source.elements_including_fixed.each do |source_element|
-          new_element = Element.copy(source_element, {
+        source_elements = source.all_elements.not_nested.not_trashed
+        source_elements.order(:position).map do |source_element|
+          Element.copy(source_element, {
             page_id: target.id
-          })
-          new_element.move_to_bottom
-          new_elements << new_element
+          }).tap(&:move_to_bottom)
         end
-        new_elements
       end
     end
 
@@ -91,7 +81,8 @@ module Alchemy
 
       return [] if @_element_definitions.blank?
 
-      @_existing_element_names = elements_including_fixed.pluck(:name)
+      existing_elements = all_elements.not_nested.not_trashed
+      @_existing_element_names = existing_elements.pluck(:name)
       delete_unique_element_definitions!
       delete_outnumbered_element_definitions!
 
@@ -177,14 +168,14 @@ module Alchemy
     #     feed_elements: [element_name, element_2_name]
     #
     def feed_elements
-      elements.available.named(definition['feed_elements'])
+      elements.named(definition['feed_elements'])
     end
 
     # Returns an array of all EssenceRichtext contents ids from not folded elements
     #
     def richtext_contents_ids
-      descendent_contents
-        .where(Element.table_name => {folded: false})
+      Alchemy::Content.joins(:element)
+        .where(Element.table_name => {page_id: id, folded: false})
         .select(&:has_tinymce?)
         .collect(&:id)
     end
@@ -196,9 +187,10 @@ module Alchemy
     # And if so, it generates them.
     #
     def generate_elements
-      elements_already_on_page = elements_including_fixed.pluck(:name)
+      existing_elements = all_elements.not_nested.not_trashed
+      existing_element_names = existing_elements.pluck(:name).uniq
       definition.fetch('autogenerate', []).each do |element_name|
-        next if elements_already_on_page.include?(element_name)
+        next if existing_element_names.include?(element_name)
         Element.create(page: self, name: element_name)
       end
     end

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

@@ -66,7 +66,7 @@ module Alchemy
       # Returns all content pages.
       #
       scope :contentpages, -> {
-        where(layoutpage: [false, nil]).where(Page.arel_table[:parent_id].not_eq(nil))
+        where(layoutpage: [false, nil]).where.not(parent_id: nil)
       }
 
       # Returns all public contentpages that are not locked.

data/app/models/alchemy/picture.rb

@@ -246,26 +246,5 @@ module Alchemy
     def image_file_dimensions
       "#{image_file_width}x#{image_file_height}"
     end
-
-    # Returns a security token for signed picture rendering requests.
-    #
-    # Pass a params hash containing:
-    #
-    #   size       [String]  (Optional)
-    #   crop       [Boolean] (Optional)
-    #   crop_from  [String]  (Optional)
-    #   crop_size  [String]  (Optional)
-    #   quality    [Integer] (Optional)
-    #
-    # to sign them.
-    #
-    def security_token(params = {})
-      params = params.dup.stringify_keys
-      params.update({
-        'crop' => params['crop'] ? 'crop' : nil,
-        'id' => id
-      })
-      PictureAttributes.secure(params)
-    end
   end
 end

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -37,7 +37,8 @@
             class: "nested-elements", data: {
               'droppable-elements' => element.nestable_elements.join(' ')
             } do %>
-        <%= render partial: 'alchemy/admin/elements/element', collection: element.nested_elements %>
+        <%= render partial: 'alchemy/admin/elements/element',
+           collection: element.all_nested_elements.not_trashed %>
       <% end %>
 
       <% if element.expanded? || element.fixed? %>

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -13,16 +13,6 @@
     <% end %>
   </div>
   <div class="toolbar_spacer"></div>
-  <% unless @page.layoutpage? %>
-  <div class="button_with_label">
-    <%= form_tag alchemy.visit_admin_page_path(@page), id: 'visit_page_form' do %>
-      <button class="icon_button" title="<%= Alchemy.t('Visit page') %>">
-        <%= render_icon('external-link-alt') %>
-      </button>
-      <label><%= Alchemy.t("Visit page") %></label>
-    <% end %>
-  </div>
-  <% end %>
   <div class="button_with_label">
     <%= link_to_dialog(
       render_icon('info-circle'),
@@ -76,6 +66,16 @@
       <% end %>
     </div>
   <% end %>
+  <% unless @page.layoutpage? %>
+    <div class="button_with_label">
+      <%= form_tag alchemy.visit_admin_page_path(@page), id: 'visit_page_form' do %>
+        <%= button_tag class: 'icon_button', disabled: !@page.public? do %>
+          <%= render_icon('external-link-alt') %>
+        <% end %>
+        <label><%= Alchemy.t("Visit page") %></label>
+      <% end %>
+    </div>
+  <% end %>
   <% if @page.has_hint? %>
     <div class="toolbar_spacer"></div>
     <%= render_hint_for(@page) %>

data/lib/alchemy/on_page_layout.rb

@@ -47,7 +47,7 @@ module Alchemy
     # Registers a callback for given page layout
     def self.register_callback(page_layout, callback)
       @callbacks ||= {}
-      @callbacks[page_layout] ||= []
+      @callbacks[page_layout] ||= Set.new
       @callbacks[page_layout] << callback
     end
 

data/lib/alchemy/test_support/factories.rb

@@ -1,3 +1,5 @@
-Dir[File.dirname(__FILE__) + '/factories/*.rb'].each do |file|
+# frozen_string_literal: true
+
+Dir["#{File.dirname(__FILE__)}/factories/*.rb"].each do |file|
   require file
 end

data/lib/alchemy/test_support/factories/attachment_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
 
 FactoryBot.define do

data/lib/alchemy/test_support/factories/content_factory.rb

@@ -1,4 +1,9 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
+require 'alchemy/test_support/factories/element_factory'
+require 'alchemy/test_support/factories/essence_file_factory'
+require 'alchemy/test_support/factories/essence_picture_factory'
 require 'alchemy/test_support/factories/essence_text_factory'
 
 FactoryBot.define do

data/lib/alchemy/test_support/factories/dummy_user_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
 
 FactoryBot.define do

data/lib/alchemy/test_support/factories/element_factory.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
+require 'alchemy/test_support/factories/page_factory'
 
 FactoryBot.define do
   factory :alchemy_element, class: 'Alchemy::Element' do

data/lib/alchemy/test_support/factories/essence_file_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
 require 'alchemy/test_support/factories/attachment_factory'
 

data/lib/alchemy/test_support/factories/essence_picture_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
 require 'alchemy/test_support/factories/picture_factory'
 

data/lib/alchemy/test_support/factories/essence_text_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
 
 FactoryBot.define do

data/lib/alchemy/test_support/factories/language_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
 require 'alchemy/test_support/factories/site_factory'
 

data/lib/alchemy/test_support/factories/page_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
 require 'alchemy/test_support/factories/language_factory'
 

data/lib/alchemy/test_support/factories/picture_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
 
 FactoryBot.define do

data/lib/alchemy/test_support/factories/site_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
 
 FactoryBot.define do

data/lib/alchemy/test_support/shared_uploader_examples.rb

@@ -1,7 +1,7 @@
 RSpec.shared_examples_for "having a json uploader error message" do
   it "renders json response with error message" do
     subject
-    expect(response.content_type).to eq('application/json')
+    expect(response.media_type).to eq('application/json')
     expect(response.status).to eq(422)
     json = JSON.parse(response.body)
     expect(json).to have_key('growl_message')

data/lib/alchemy/upgrader/tasks/cells_migration.rb

@@ -27,13 +27,11 @@ module Alchemy::Upgrader::Tasks
       # bust element definitions insta cache
       Alchemy::Element.instance_variable_set('@definitions', nil)
       fixed_element = Alchemy::Element.find_or_initialize_by(fixed: true, name: cell.name, page: cell.page)
-      elements = Alchemy::Element.where(cell_id: cell.id).order(position: :asc)
+      elements = Alchemy::Element.where(cell_id: cell.id)
 
       if fixed_element.new_record?
+        fixed_element.nested_elements = elements
         fixed_element.save!
-        Alchemy::Element.acts_as_list_no_update do
-          elements.update_all(parent_element_id: fixed_element.id)
-        end
         puts "Created new fixed element '#{fixed_element.name}' for cell '#{cell.name}'."
       else
         puts "Element for cell '#{cell.name}' already present. Skip"

data/lib/alchemy/upgrader/tasks/cells_upgrader.rb

@@ -114,9 +114,9 @@ module Alchemy::Upgrader::Tasks
       if Dir.exist? cells_view_folder
         puts "-- Update cell views"
         Dir.glob("#{cells_view_folder}/*").each do |view|
-          gsub_file(view, /elements\.published/, 'elements.available')
+          gsub_file(view, /elements\.published/, 'elements')
           gsub_file(view, /cell\.elements(.+)/, 'element.nested_elements\1')
-          gsub_file(view, /render_elements[\(\s]?:?from_cell:?\s?(=>)?\s?cell\)?/, 'render element.nested_elements.available')
+          gsub_file(view, /render_elements[\(\s]?:?from_cell:?\s?(=>)?\s?cell\)?/, 'render element.nested_elements')
           gsub_file(view, /cell/, 'element')
         end
       else
@@ -129,7 +129,6 @@ module Alchemy::Upgrader::Tasks
       Dir.glob("#{alchemy_views_folder}/**/*").each do |view|
         next if File.directory?(view)
         gsub_file(view, /render_cell[\(\s]?([:'"]?[a-z_]+['"]?)\)?/, 'render_elements(only: \1, fixed: true)')
-        gsub_file(view, /render_elements[\(\s](.*):?from_cell:?\s?(=>)?\s?(['"][a-z_]+['"])\)?/, 'render_elements(\1only: \3, fixed: true)')
       end
     end
 

data/lib/alchemy/upgrader/tasks/picture_gallery_upgrader.rb

@@ -91,22 +91,22 @@ module Alchemy::Upgrader::Tasks
     def find_gallery_pictures_rendering
       puts '5. Find element views that use gallery pictures:'
 
-      erb_snippet = '   <%= render element.nested_elements.available %>'
+      erb_snippet = '   <%= render element.nested_elements %>'
       erb_views = erb_element_partials(:view).select do |view|
         next if File.read(view).match(GALLERY_PICTURES_ERB_REGEXP).nil?
 
         inject_into_file view,
-          "<%# TODO: Move the content of next block into its nestable element view and `render element.nested_elements.available` instead %>\n",
+          "<%# TODO: Move the content of next block into its nestable element view and `render element.nested_elements` instead %>\n",
           before: GALLERY_PICTURES_ERB_REGEXP
         true
       end
 
-      haml_slim_snippet = '   = element.nested_elements.available'
+      haml_slim_snippet = '   = element.nested_elements'
       haml_views = haml_slim_element_partials(:view).select do |view|
         next if File.read(view).match(GALLERY_PICTURES_HAML_REGEXP).nil?
 
         inject_into_file view,
-          "-# TODO: Move the content of next block into its nestable element view and `render element.nested_elements.available` instead\n",
+          "-# TODO: Move the content of next block into its nestable element view and `render element.nested_elements` instead\n",
           before: GALLERY_PICTURES_HAML_REGEXP
         true
       end