alchemy_cms 3.3.0.rc1 → 3.3.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0aceaeeaef206172b82d634ae32252349217f322
-  data.tar.gz: 649efbc4c49f43b6d42bd57455c0fffceae6b28f
+  metadata.gz: 5b96881451c7611c03a33ac92666841c2bd6a03e
+  data.tar.gz: 0b5bbdccfe93eb0dd472e22bdd4bef342c5e5dfa
 SHA512:
-  metadata.gz: 1520b2d1092a8a0341ea3e01bd45a981f94559112208b0405c84c5bbdf199c3e0f84789df79b03776ce7a2c5e5e9f837c44ee537dff7edf1f56715aaefc43f9c
-  data.tar.gz: eadd3e19d0eb0bab2b9f929beb66a25989e71e086bdb104e42944342da5ce8ec07c5510e8d8eec35da6466d1110ee5e45110c0803137afb7f470ee6aebbb98ed
+  metadata.gz: 83f2371b4a3f76bc1fe5fa6aa1f716aebea9105d0891b878fa7620cb5f2e75b228e579670f1a03da00b24dcc4aa666e380738bda5312889d9cc85f730b1649c0
+  data.tar.gz: 58cf314fe01120b0bd00b18dcb891df015baed64fa0cb73611b76d50194b8227fb2d09f9185813568ad10346c3fb02f32a93f72aed54f3e0a515c32ef7600ce8

data/CHANGELOG.md

@@ -15,9 +15,10 @@ __New Features__
 * Resource forms can now have Tinymce enabled by adding `.tinymce` class
 * `Alchemy::EssenceFile` now has a `link_text` attribute, so the editor is able to change the linked text of the download link.
 * Enable to pass multiple page layout names to `on_page_layout` callbacks
-* Client side rendering of the pages admin _(not merged yet)_
-* Deprecate `redirect_index` configuration _(not merged yet)_
+* Client side rendering of the pages admin
+* Deprecate `redirect_index` configuration
 * Add Nestable elements feature
+* Default site in seeder is now configurable
 
 __Notable Changes__
 

data/Gemfile

@@ -31,6 +31,7 @@ group :development, :test do
   gem 'poltergeist', '~> 1.5'
   gem 'rspec-activemodel-mocks', '~> 1.0'
   gem 'rspec-rails', '~> 3.0'
+  gem 'shoulda-matchers', '~> 3.1'
 end
 
 # We need this if we want to start the dummy app in development mode

data/alchemy_cms.gemspec

@@ -1,21 +1,21 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'alchemy/version'
 
 Gem::Specification.new do |gem|
   gem.name                  = 'alchemy_cms'
   gem.version               = Alchemy::VERSION
   gem.platform              = Gem::Platform::RUBY
-  gem.authors               = ['Thomas von Deyen', 'Robin Boening', 'Marc Schettke', 'Hendrik Mans', 'Carsten Fregin']
+  gem.authors               = ['Thomas von Deyen', 'Robin Boening', 'Marc Schettke', 'Hendrik Mans', 'Carsten Fregin', 'Martin Meyerhoff']
   gem.email                 = ['alchemy@magiclabs.de']
-  gem.homepage              = 'http://alchemy-cms.com'
+  gem.homepage              = 'https://alchemy-cms.com'
   gem.summary               = 'A powerful, userfriendly and flexible CMS for Rails 4'
   gem.description           = 'Alchemy is a powerful, userfriendly and flexible Rails 4 CMS.'
   gem.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
   gem.required_ruby_version = '>= 2.0.0'
   gem.license               = 'BSD New'
-  gem.files                 = `git ls-files`.split("\n")
-  gem.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   gem.executables           = 'alchemy'
   gem.require_paths         = ['lib']
 

data/app/assets/javascripts/alchemy/alchemy.base.js.coffee

@@ -69,13 +69,6 @@ $.extend Alchemy,
       Alchemy.setElementDirty $element
     false
 
-  # Sets the element to saved state
-  setElementSaved: (selector) ->
-    $element = $(selector)
-    Alchemy.setElementClean selector
-    Alchemy.Buttons.enable $element
-    true
-
   # Initializes all select tag with .alchemy_selectbox class as selectBoxIt instance
   # Pass a jQuery scope to only init a subset of selectboxes.
   SelectBox: (scope) ->

data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee

@@ -248,19 +248,19 @@ window.Alchemy.openDialog = (url, options) ->
 #
 # See Alchemy.Dialog for further options you can add to the data attribute
 #
-window.Alchemy.watchForDialogs = (scope) ->
-  $('a[data-alchemy-dialog]', scope).click (e) ->
+window.Alchemy.watchForDialogs = (scope = '#alchemy') ->
+  $(scope).on 'click', '[data-alchemy-dialog]', (e) ->
     $this = $(this)
     url = $this.attr('href')
     options = $this.data('alchemy-dialog')
     Alchemy.openDialog(url, options)
     false
-  $('a[data-alchemy-confirm-delete]', scope).click (event) ->
+  $(scope).on 'click', '[data-alchemy-confirm-delete]', (event) ->
     $this = $(this)
     options = $this.data('alchemy-confirm-delete')
     Alchemy.confirmToDeleteDialog($this.attr('href'), options)
     false
-  $('input[data-alchemy-confirm], button[data-alchemy-confirm]', scope).click (event) ->
+  $(scope).on 'click', '[data-alchemy-confirm]', (event) ->
     options = $(this).data('alchemy-confirm')
     Alchemy.openConfirmDialog options.message, $.extend options,
       ok_label: options.ok_label

data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee

@@ -14,15 +14,12 @@ Alchemy.ElementEditors =
   #
   init: ->
     @element_area = $("#element_area")
-    # Binds the custom FocusElementEditor event
-    @element_area.on "FocusElementEditor.Alchemy", '.element-editor', (e) =>
-      @onFocusElement(e)
-    @bindClickEvents()
+    @bindEvents()
     return
 
   # Binds click events on several DOM elements from element editors
   # Uses event delegation, so it is not necessary to rebind these events.
-  bindClickEvents: ->
+  bindEvents: ->
     @element_area.on "click", ".element-header", (e) =>
       @onClickElement(e)
     @element_area.on "dblclick", ".element-header", (e) =>
@@ -31,6 +28,12 @@ Alchemy.ElementEditors =
       @onClickToggle(e)
     @element_area.on "click", '[data-create-missing-content]', (e) =>
       @onClickMissingContent(e)
+    # Binds the custom FocusElementEditor event
+    @element_area.on "FocusElementEditor.Alchemy", '.element-editor', (e) =>
+      @onFocusElement(e)
+    # Binds the custom SaveElement event
+    @element_area.on "SaveElement.Alchemy", '.element-editor', (e, data) =>
+      @onSaveElement(e, data)
     return
 
   # Selects and scrolls to element with given id in the preview window.
@@ -145,6 +148,29 @@ Alchemy.ElementEditors =
         callback.call()
       return
 
+  # Updates the title quote if one of the several conditions are met
+  updateTitle: (element, title, event) ->
+    return true if not @_shouldUpdateTitle(element, event)
+    @setTitle(element, title)
+    return
+
+  # Sets the title quote without checking that the conditions are met
+  setTitle: (element, title) ->
+    $quote = element.find('> .element-header .preview_text_quote')
+    $quote.text(title)
+    return
+
+  # Sets the element to saved state
+  onSaveElement: (event, data) ->
+    $element = $(event.currentTarget)
+    # JS event bubbling will also update the parents element quote.
+    @updateTitle($element, data.previewText, event)
+    # Prevent this event from beeing called twice on the same element
+    if event.currentTarget == event.target
+      Alchemy.setElementClean($element)
+      Alchemy.Buttons.enable($element)
+    true
+
   # Event handlers
 
   # Click event handler for element head.
@@ -200,3 +226,23 @@ Alchemy.ElementEditors =
     querystring = link.search.replace(/\?/, '')
     $.post(url, querystring)
     false
+
+  # private
+
+  _shouldUpdateTitle: (element, event) ->
+    editors = element.find('> .element-content .element-content-editors').children()
+    if @_hasParents(element)
+      editors.length != 0
+    else if @_isParent(element) && @_isFirstChild $(event.target)
+      editors.length == 0
+    else
+      not @_isParent(element)
+
+  _hasParents: (element) ->
+    element.parents('.element-editor').length != 0
+
+  _isParent: (element) ->
+    element.find('.nestable-elements').length != 0
+
+  _isFirstChild: (element) ->
+    element.closest('.nestable-elements').find(':first-child').is(element)

data/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee

@@ -49,8 +49,6 @@ Alchemy.Sitemap =
       self.items = $(".sitemap_page", '#sitemap')
       self._observe()
 
-      Alchemy.watchForDialogs('#sitemap')
-
       if self.options.ready
         self.options.ready()
 

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

@@ -32,12 +32,12 @@
 .element-title {
   overflow: hidden;
   white-space: nowrap;
-  max-width: 322px;
+  max-width: 85%;
   margin-left: $default-margin;
+  text-overflow: ellipsis;
 
   .preview_text_quote {
     font-size: 10px;
-    font-style: italic;
     line-height: 15px;
   }
 }

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

@@ -90,6 +90,7 @@ module Alchemy
 
       def order
         @trashed_element_ids = Element.trashed.where(id: params[:element_ids]).pluck(:id)
+        @parent_element = Element.find_by(id: params[:parent_element_id])
         Element.transaction do
           params.fetch(:element_ids, []).each_with_index do |element_id, idx|
             # Ensure to set page_id, cell_id and parent_element_id to the current page and
@@ -101,6 +102,7 @@ module Alchemy
               position: idx + 1
             )
           end
+          @parent_element.try!(:touch)
         end
       end
 

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

@@ -36,9 +36,7 @@ module Alchemy
       def tree
         authorize! :tree, :alchemy_admin_pages
 
-        render json: PageTreeSerializer.new(@page, ability: current_ability,
-                                            user: current_alchemy_user,
-                                            full: params[:full] == 'true')
+        render json: serialized_page_tree
       end
 
       # Used by page preview iframe in Page#edit view.
@@ -103,6 +101,10 @@ module Alchemy
         if @page.update_attributes(page_params)
           @notice = Alchemy.t("Page saved", name: @page.name)
           @while_page_edit = request.referer.include?('edit')
+
+          unless @while_page_edit
+            @tree = serialized_page_tree
+          end
         else
           configure
         end
@@ -372,6 +374,12 @@ module Alchemy
       def set_root_page
         @page_root = Language.current_root_page
       end
+
+      def serialized_page_tree
+        PageTreeSerializer.new(@page, ability: current_ability,
+                                      user: current_alchemy_user,
+                                      full: params[:full] == 'true')
+      end
     end
   end
 end

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

@@ -133,6 +133,7 @@ module Alchemy
         @content = Content.select('id').find_by(id: params[:content_id])
         @element = Element.select('id').find_by(id: params[:element_id])
         @options = options_from_params
+
         respond_to do |format|
           format.html { render partial: 'archive_overlay' }
           format.js   { render action:  'archive_overlay' }

data/app/models/alchemy/element.rb

@@ -57,7 +57,9 @@ module Alchemy
 
     stampable stamper_class_name: Alchemy.user_class_name
 
-    has_many :contents, -> { order(:position) }, dependent: :destroy
+    # Content positions are scoped by their essence_type, so positions can be the same for different contents.
+    # 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 :nested_elements,

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

@@ -137,13 +137,8 @@ module Alchemy
 
     # creates the contents for this element as described in the elements.yml
     def create_contents
-      contents = []
-      if definition["contents"].blank?
-        log_warning "Could not find any content definitions for element: #{name}"
-      else
-        definition["contents"].each do |content_hash|
-          contents << Content.create_from_scratch(self, content_hash.symbolize_keys)
-        end
+      definition.fetch("contents", []).each do |content_hash|
+        Content.create_from_scratch(self, content_hash.symbolize_keys)
       end
     end
   end

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

@@ -39,10 +39,10 @@ module Alchemy
     #
     # You can flag a Content as +as_element_title+ to take this as preview.
     #
-    # @param maxlength [Fixnum] (30)
+    # @param maxlength [Fixnum] (60)
     #   Length of characters after the text will be cut off.
     #
-    def preview_text(maxlength = 30)
+    def preview_text(maxlength = 60)
       preview_text_from_preview_content(maxlength) || preview_text_from_nested_elements(maxlength)
     end
 
@@ -80,8 +80,15 @@ module Alchemy
       "#{name}_#{id}"
     end
 
+    # The content that's used for element's preview text.
+    #
+    # It tries to find one of element's contents that is defined +as_element_title+.
+    # Takes element's first content if no content is defined +as_element_title+.
+    #
+    # @return (Alchemy::Content)
+    #
     def preview_content
-      @_preview_content ||= contents.detect(&:preview_content?)
+      @_preview_content ||= contents.detect(&:preview_content?) || contents.first
     end
 
     private
@@ -92,7 +99,7 @@ module Alchemy
     end
 
     def preview_text_from_preview_content(maxlength)
-      (preview_content || contents.first).try(:preview_text, maxlength)
+      preview_content.try!(:preview_text, maxlength)
     end
   end
 end

data/app/models/alchemy/page.rb

@@ -70,9 +70,11 @@ module Alchemy
 
     stampable stamper_class_name: Alchemy.user_class_name
 
+    belongs_to :language
+
+    has_one :site, through: :language
     has_many :folded_pages
     has_many :legacy_urls, class_name: 'Alchemy::LegacyPageUrl'
-    belongs_to :language
 
     validates_presence_of :language, on: :create, unless: :root
     validates_presence_of :page_layout, unless: :systempage?

data/app/views/alchemy/admin/attachments/archive_overlay.js.erb

@@ -2,6 +2,5 @@
   var dialog = Alchemy.currentDialog();
   dialog.dialog_body.html('<%= j render("archive_overlay") %>');
   Alchemy.SelectBox('#filter_bar');
-  Alchemy.watchForDialogs(dialog.dialog_body);
   Alchemy.ListFilter(dialog.dialog_body);
 })();

data/app/views/alchemy/admin/contents/create.js.erb

@@ -53,4 +53,3 @@ Alchemy.Tinymce.initEditor(<%= @content.id %>);
 Alchemy.reloadPreview();
 Alchemy.closeCurrentDialog();
 Alchemy.SelectBox("#element_<%= @element.id %>");
-Alchemy.watchForDialogs('#<%= @content.dom_id %>');

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

@@ -9,7 +9,9 @@
   </span>
   <span class="element-title">
     <span class="preview_text_element_name"><%= element.display_name %></span>
-    <span class="preview_text_quote"><%= sanitize(element.preview_text) %></span>
+    <span class="preview_text_quote">
+      <%= sanitize(element.preview_text.presence || '&nbsp;') %>
+    </span>
   </span>
   <%= render_hint_for(element) unless element.trashed? %>
   <span class="ajax-folder" <%= element.trashed? ? 'style="display: none"'.html_safe : '' %>>

data/app/views/alchemy/admin/elements/order.js.erb

@@ -1,13 +1,28 @@
-$('#element_area .ajax-folder').show();
-Alchemy.PreviewWindow.refresh();
-<% if @trashed_element_ids.any? %>
-Alchemy.growl('<%= Alchemy.t(:successfully_restored_element) -%>');
-<% element_ids = @trashed_element_ids.collect do |id|
-                   "#element_area [data-element-id=\"#{id}\"]"
-                 end.join(", ").html_safe %>
-<% @trashed_element_ids.each do |id| %>
-$('<%= element_ids %>').each(function() { this.id = 'element_' + <%= id %> });
+(function() {
+<% if @parent_element && @parent_element.contents.empty? %>
+  var $parent = $('#element_<%= @parent_element.id %>');
+  Alchemy.ElementEditors.setTitle(
+    $parent,
+    '<%= sanitize(@parent_element.preview_text.presence || '&nbsp;') %>'
+  );
 <% end %>
+
+<% if @trashed_element_ids.any? %>
+
+  $('#element_area .ajax-folder').show();
+  <% element_ids = @trashed_element_ids.collect do |id|
+                     "#element_area [data-element-id=\"#{id}\"]"
+                   end.join(", ").html_safe %>
+  <% @trashed_element_ids.each do |id| %>
+  $('<%= element_ids %>').each(function() { this.id = 'element_' + <%= id %> });
+  <% end %>
+  Alchemy.growl('<%= Alchemy.t(:successfully_restored_element) -%>');
+
 <% else %>
-Alchemy.growl('<%= Alchemy.t(:successfully_saved_element_position) -%>');
+
+  Alchemy.growl('<%= Alchemy.t(:successfully_saved_element_position) -%>');
+
 <% end %>
+
+  Alchemy.PreviewWindow.refresh();
+})();

data/app/views/alchemy/admin/elements/update.js.erb

@@ -5,9 +5,8 @@
 
 <%- if @element_validated -%>
 
-  $el.find('> .element-header').replaceWith('<%= j render("element_header", element: @element) %>');
   $errors.hide();
-  Alchemy.setElementSaved($el);
+  $el.trigger('SaveElement.Alchemy', {previewText: '<%= sanitize(@element.preview_text) %>'});
   Alchemy.growl('<%= Alchemy.t(:element_saved) %>');
   Alchemy.PreviewWindow.refresh(function() {
     Alchemy.ElementEditors.selectElementInPreview(<%= @element.id %>);

data/app/views/alchemy/admin/essence_files/assign.js.erb

@@ -6,4 +6,3 @@ $('#<%= @content.dom_id %>').replaceWith('<%= j(
 ) %>');
 Alchemy.closeCurrentDialog();
 Alchemy.setElementDirty($('#element_<%= @content.element.id %>'));
-Alchemy.watchForDialogs($('#<%= @content.dom_id %>'));

data/app/views/alchemy/admin/essence_pictures/assign.js.erb

@@ -15,4 +15,3 @@ Alchemy.SortableContents('#<%= @content.element.id -%>_contents', '<%= form_auth
 
 Alchemy.closeCurrentDialog();
 Alchemy.setElementDirty('#element_<%= @content.element.id %>');
-Alchemy.watchForDialogs('#<%= @content.dom_id %>');

data/app/views/alchemy/admin/legacy_page_urls/create.js.erb

@@ -4,7 +4,6 @@
   $('#legacy_page_url_urlname').val('');
   $('#no_page_links_notice').hide();
   $('#legacy_page_urls').append('<%=j render "legacy_page_url", legacy_page_url: @legacy_page_url %>');
-  Alchemy.watchForDialogs('#<%= dom_id(@legacy_page_url) %>');
 <% else %>
   $('#new_legacy_page_url').replaceWith('<%=j render("new") %>');
 <% end %>