alchemy_cms 3.5.0 → 3.6.0

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

@@ -95,7 +95,7 @@ module Alchemy
     def content_definition_for(content_name)
       if content_definitions.blank?
         log_warning "Element #{name} is missing the content definition for #{content_name}"
-        return nil
+        nil
       else
         content_definitions.detect { |d| d['name'] == content_name }
       end

data/app/models/alchemy/essence_picture_view.rb

@@ -9,7 +9,9 @@ module Alchemy
 
     DEFAULT_OPTIONS = {
       show_caption: true,
-      disable_link: false
+      disable_link: false,
+      srcset: [],
+      sizes: []
     }
 
     def initialize(content, options = {}, html_options = {})
@@ -59,7 +61,9 @@ module Alchemy
         essence.picture_url(options.except(*DEFAULT_OPTIONS.keys)), {
           alt: essence.alt_tag.presence,
           title: essence.title.presence,
-          class: caption ? nil : essence.css_class.presence
+          class: caption ? nil : essence.css_class.presence,
+          srcset: srcset.join(', ').presence,
+          sizes: options[:sizes].join(', ').presence
         }.merge(caption ? {} : html_options)
       )
     end
@@ -71,5 +75,13 @@ module Alchemy
     def is_linked?
       !options[:disable_link] && essence.link.present?
     end
+
+    def srcset
+      options[:srcset].map do |size|
+        url = essence.picture_url(size: size)
+        width, height = size.split('x')
+        width.present? ? "#{url} #{width}w" : "#{url} #{height}h"
+      end
+    end
   end
 end

data/app/models/alchemy/language.rb

@@ -128,18 +128,18 @@ module Alchemy
     def publicity_of_default_language
       if default? && !public?
         errors.add(:public, Alchemy.t("Default language has to be public"))
-        return false
+        false
       else
-        return true
+        true
       end
     end
 
     def presence_of_default_language
       if Language.default == self && default_changed?
         errors.add(:default, Alchemy.t("We need at least one default."))
-        return false
+        false
       else
-        return true
+        true
       end
     end
 

data/app/models/alchemy/page.rb

@@ -43,7 +43,6 @@ module Alchemy
 
     DEFAULT_ATTRIBUTES_FOR_COPY = {
       do_not_autogenerate: true,
-      do_not_sweep: true,
       visible: false,
       public_on: nil,
       public_until: nil,
@@ -99,9 +98,6 @@ module Alchemy
     validates_format_of :page_layout, with: /\A[a-z0-9_-]+\z/, unless: -> { systempage? || page_layout.blank? }
     validates_presence_of :parent_id, if: proc { Page.count > 1 }
 
-    attr_accessor :do_not_sweep
-    attr_accessor :do_not_validate_language
-
     before_save :set_language_code,
       if: -> { language.present? },
       unless: :systempage?
@@ -143,6 +139,15 @@ module Alchemy
     # Class methods
     #
     class << self
+      # The root page of the page tree
+      #
+      # Internal use only. You wouldn't use this page ever.
+      #
+      # Automatically created when accessed the first time.
+      #
+      def root
+        super || create!(name: 'Root')
+      end
       alias_method :rootpage, :root
 
       # Used to store the current page previewed in the edit page template.
@@ -306,19 +311,27 @@ module Alchemy
 
     # Returns the previous page on the same level or nil.
     #
-    # For options @see #next_or_previous
+    # @option options [Boolean] :restricted (false)
+    #   only restricted pages (true), skip restricted pages (false)
+    # @option options [Boolean] :public (true)
+    #   only public pages (true), skip public pages (false)
     #
     def previous(options = {})
-      next_or_previous('<', options)
+      pages = self_and_siblings.where('lft < ?', lft)
+      select_page(pages, options.merge(order: :desc))
     end
     alias_method :previous_page, :previous
 
     # Returns the next page on the same level or nil.
     #
-    # For options @see #next_or_previous
+    # @option options [Boolean] :restricted (false)
+    #   only restricted pages (true), skip restricted pages (false)
+    # @option options [Boolean] :public (true)
+    #   only public pages (true), skip public pages (false)
     #
     def next(options = {})
-      next_or_previous('>', options)
+      pages = self_and_siblings.where('lft > ?', lft)
+      select_page(pages, options.merge(order: :asc))
     end
     alias_method :next_page, :next
 
@@ -453,26 +466,10 @@ module Alchemy
       end
     end
 
-    # Returns the next or previous page on the same level or nil.
-    #
-    # @param [String]
-    #   Pass '>' for next and '<' for previous page.
-    #
-    # @option options [Boolean] :restricted (nil)
-    #   only restricted pages (true), skip restricted pages (false)
-    # @option options [Boolean] :public (true)
-    #   only public pages (true), skip public pages (false)
-    #
-    def next_or_previous(dir = '>', options = {})
-      options = {
-        restricted: false,
-        public: true
-      }.update(options)
-
-      pages = self_and_siblings.where(["#{Page.table_name}.lft #{dir} ?", lft])
-      pages = options[:public] ? pages.published : pages.not_public
-      pages.where(restricted: options[:restricted])
-        .reorder(dir == '>' ? 'lft' : 'lft DESC')
+    def select_page(pages, options = {})
+      pages = options.fetch(:public, true) ? pages.published : pages.not_public
+      pages.where(restricted: options.fetch(:restricted, false))
+        .reorder(lft: options.fetch(:order))
         .limit(1).first
     end
 

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

@@ -310,7 +310,7 @@ module Alchemy
       if cell = cells.find_by_name(name)
         cell.elements
       else
-        Alchemy::Logger.warn("Cell with name `#{name}` could not be found!", caller.first)
+        Alchemy::Logger.warn("Cell with name `#{name}` could not be found!", caller(0..0))
         Element.none
       end
     end

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

@@ -20,7 +20,7 @@ module Alchemy
     end
 
     def systempage?
-      return true if Page.root.nil?
+      return true if Page.count.zero?
       rootpage? || (parent_id == Page.root.id && !language_root?)
     end
 

data/app/models/alchemy/picture.rb

@@ -92,6 +92,10 @@ module Alchemy
     # Class methods
 
     class << self
+      def searchable_alchemy_resource_attributes
+        %w(name image_file_name)
+      end
+
       def last_upload
         last_picture = Picture.last
         return Picture.all unless last_picture
@@ -231,7 +235,7 @@ module Alchemy
     # Returns true if picture is not assigned to any EssencePicture.
     #
     def deletable?
-      !essence_pictures.any?
+      essence_pictures.empty?
     end
 
     # A size String from original image file values.

data/app/models/alchemy/site.rb

@@ -24,7 +24,7 @@ module Alchemy
     scope :published, -> { where(public: true) }
 
     # Callbacks
-    before_create :create_default_language, unless: -> { languages.any? }
+    before_create :create_default_language!, unless: -> { languages.any? }
 
     # concerns
     include Alchemy::Site::Layout
@@ -62,7 +62,7 @@ module Alchemy
       end
 
       def default
-        Site.first
+        Site.first || create_default_site!
       end
 
       def find_for_host(host)
@@ -79,23 +79,38 @@ module Alchemy
           site.aliases.split.include?(host) if site.aliases.present?
         end
       end
+
+      private
+
+      def create_default_site!
+        default_site = Alchemy::Config.get(:default_site)
+        if default_site
+          create!(name: default_site['name'], host: default_site['host'])
+        else
+          raise DefaultSiteNotFoundError
+        end
+      end
     end
 
     private
 
     # If no languages are present, create a default language based
     # on the host app's Alchemy configuration.
-    def create_default_language
+    def create_default_language!
       default_language = Alchemy::Config.get(:default_language)
-      languages.build(
-        name:           default_language['name'],
-        language_code:  default_language['code'],
-        locale:         default_language['code'],
-        frontpage_name: default_language['frontpage_name'],
-        page_layout:    default_language['page_layout'],
-        public:         true,
-        default:        true
-      )
+      if default_language
+        languages.build(
+          name:           default_language['name'],
+          language_code:  default_language['code'],
+          locale:         default_language['code'],
+          frontpage_name: default_language['frontpage_name'],
+          page_layout:    default_language['page_layout'],
+          public:         true,
+          default:        true
+        )
+      else
+        raise DefaultLanguageNotFoundError
+      end
     end
   end
 end

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

@@ -1,14 +1,15 @@
-<% p = params.dup %>
-<h2><%= Alchemy.t("Filter by tag") %></h2>
-<%= js_filter_field '.tag-list li' %>
-<ul>
-  <%= render_tag_list('Alchemy::Attachment', p) %>
-</ul>
-<% if p[:tagged_with].present? %>
-  <%= link_to(
-    render_icon('delete-small') + Alchemy.t('Remove tag filter'),
-    url_for(p.delete_if { |k, v| k == "tagged_with" }.merge(action: 'index')),
-    remote: request.xhr?,
-    class: 'button small with_icon please_wait'
-  ) %>
+<% if Alchemy::Attachment.tag_counts.any? %>
+  <h2><%= Alchemy.t("Filter by tag") %></h2>
+  <%= js_filter_field '.tag-list li' %>
+  <ul>
+    <%= render_tag_list('Alchemy::Attachment') %>
+  </ul>
+  <% if params[:tagged_with].present? %>
+    <%= link_to(
+      render_icon('delete-small') + Alchemy.t('Remove tag filter'),
+      url_for(tag_list_params.delete_if { |k, v| k == "tagged_with" }.merge(action: 'index')),
+      remote: request.xhr?,
+      class: 'button small with_icon please_wait'
+    ) %>
+  <% end %>
 <% end %>

data/app/views/alchemy/admin/dashboard/info.html.erb

@@ -46,7 +46,7 @@
 <script type="text/javascript">
   (function() {
     var el = $('#update_check');
-    var spinner = Alchemy.Spinner.small();
+    var spinner = new Alchemy.Spinner('small');
     spinner.spin(el[0]);
     $.get('<%= alchemy.update_check_path %>', function(data, textStatus, jqXHR) {
       if (data == 'true') {

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

@@ -2,7 +2,7 @@
   <%= f.input :page_layout,
     collection: @page_layouts,
     label: page_layout_label(@page),
-    include_blank: false,
+    include_blank: Alchemy.t('Please choose'),
     input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :name, autofocus: true %>
   <% if @page.taggable? %>

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

@@ -31,7 +31,7 @@
         collection: @page_layouts,
         selected: @language.page_layout,
         label: Alchemy.t(:page_type),
-        include_blank: false,
+        include_blank: Alchemy.t('Please choose'),
         required: true,
         input_html: {class: 'alchemy_selectbox'} %>
       <%= form.hidden_field :language_id, value: @language.id %>

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

@@ -2,7 +2,7 @@
   <%= f.input :page_layout,
     collection: @page_layouts,
     label: page_layout_label(@page),
-    include_blank: false,
+    include_blank: Alchemy.t('Please choose'),
     input_html: {class: 'alchemy_selectbox'} %>
 
   <div class="input check_boxes">

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

@@ -4,7 +4,7 @@
   <%= f.input :page_layout,
     collection: @page_layouts,
     label: Alchemy.t(:page_type),
-    include_blank: false,
+    include_blank: Alchemy.t('Please choose'),
     required: true,
     input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :name %>

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

@@ -8,7 +8,7 @@
           alchemy.fold_admin_page_path(page),
           remote: true,
           method: :post,
-          class: "page_folder {{#if folded}}folded{{else}}collapsed{{/if}} spinner",
+          class: "page_folder {{#if folded}}folded{{else}}collapsed{{/if}}",
           title: "{{#if folded}}#{Alchemy.t('Show childpages')}{{else}}#{Alchemy.t('Hide childpages')}{{/if}}",
           id: "fold_button_{{id}}"
         )

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

@@ -22,10 +22,10 @@
      full: <%= full %>
      <% if @sorting  %>
      ,ready: function () {
-       Alchemy.PageSorter.init();
+       Alchemy.PageSorter();
      }
      <% elsif action_name == 'link' %>
-     ,spinner: Alchemy.Spinner.small(),
+     ,spinner: new Alchemy.Spinner('small'),
      ready: function () {
        if (Alchemy.currentDialog()) {
          Alchemy.currentDialog().attachTreeEvents();

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

@@ -2,7 +2,7 @@
   <%= f.input :page_layout,
     collection: @page_layouts,
     label: Alchemy.t(:page_type),
-    include_blank: false,
+    include_blank: Alchemy.t('Please choose'),
     input_html: {class: 'alchemy_selectbox'} %>
   <div class="input check_boxes">
     <label class="control-label"><%= Alchemy.t(:page_status) %></label>

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

@@ -16,15 +16,13 @@
   </div>
   <% end %>
   <% if can?(:sort, Alchemy::Page) %>
-  <div class="button_with_label" id="page_sorting_button">
+  <div class="button_with_label">
     <%= link_to(
-      render_icon('sort'),
+      render_icon(:sort),
       alchemy.sort_admin_pages_path,
-      :complete => '',
-      :method => :get,
-      :remote => true,
-      :class => 'icon_button please_wait',
-      :title => Alchemy.t('Sort pages')
+      method: :get,
+      class: 'icon_button please_wait',
+      title: Alchemy.t('Sort pages')
     ) %>
     <label><%= Alchemy.t('Sort pages') %></label>
   </div>

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

@@ -0,0 +1,19 @@
+<% content_for :toolbar do %>
+  <div class="button_with_label">
+    <%= link_to alchemy.admin_pages_path, class: 'icon_button' do %>
+      <%= render_icon :back %>
+    <% end %>
+    <label><%= Alchemy.t(:cancel) %></label>
+  </div>
+<% end %>
+
+<div id="sort_panel">
+  <%= render_message do %>
+    <%= Alchemy.t(:explain_sitemap_dragndrop_sorting) %>
+  <% end %>
+  <div class="buttons">
+    <%= button_tag Alchemy.t('save order'), id: 'save_page_order' %>
+  </div>
+</div>
+
+<%= render 'sitemap', page_partial: 'page', full: true %>

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

@@ -15,7 +15,7 @@
 
   var page_html = "<%= j render('page', page: @page) %>";
   var compiler = Handlebars.compile(page_html);
-  var tree = JSON.parse('<%== @tree.to_json %>');
+  var tree = <%== @tree.to_json %>;
   var html = compiler(tree.pages[0]);
   $('#page_<%= @page.id %>').replaceWith(html);
 

data/app/views/alchemy/admin/pictures/_archive.html.erb

@@ -1,37 +1,37 @@
 <div id="library_sidebar">
-  <%= render :partial => 'filter_bar' %>
+  <%= render 'filter_bar' %>
   <div class="tag-list with_filter_bar<%= params[:tagged_with].present? ? ' filtered' : '' %>">
-    <%= render :partial => 'tag_list' %>
+    <%= render 'tag_list' %>
   </div>
 </div>
-<%= form_tag delete_multiple_admin_pictures_path, :method => :delete do %>
+<%= form_tag delete_multiple_admin_pictures_path, method: :delete do %>
   <div class="selected_item_tools">
     <h2><%= Alchemy.t(:edit_selected_pictures) %></h2>
     <%= link_to(
       render_icon('edit') + Alchemy.t("Edit"),
       edit_multiple_admin_pictures_path,
-      :class => 'button with_icon',
-      :title => Alchemy.t('Edit multiple pictures'),
-      :id => 'edit_multiple_pictures',
-      :style => 'float: none'
+      class: 'button with_icon',
+      title: Alchemy.t('Edit multiple pictures'),
+      id: 'edit_multiple_pictures',
+      style: 'float: none'
     ) %>
     <%= button_tag render_icon('destroy') + Alchemy.t("Delete"), 'data-alchemy-confirm' => {
-      :title => Alchemy.t(:please_confirm),
-      :message => Alchemy.t(:confirm_to_delete_images_from_server),
-      :ok_label => Alchemy.t("Yes"),
-      :cancel_label => Alchemy.t("No")
-    }.to_json, :class => 'button with_icon' %>
+      title: Alchemy.t(:please_confirm),
+      message: Alchemy.t(:confirm_to_delete_images_from_server),
+      ok_label: Alchemy.t("Yes"),
+      cancel_label: Alchemy.t("No")
+    }.to_json, class: 'button with_icon' %>
     &nbsp;<%= Alchemy.t(:or) %>&nbsp;
     <%= link_to(
       render_icon('delete-small') + Alchemy.t("Clear selection"),
       admin_pictures_path(
-        :q => params[:q],
-        :tagged_with => params[:tagged_with],
-        :size => params[:size],
-        :filter => params[:filter]
+        q: params[:q],
+        tagged_with: params[:tagged_with],
+        size: params[:size],
+        filter: params[:filter]
       ),
-      :class => 'button with_icon',
-      :style => 'float: none'
+      class: 'button with_icon',
+      style: 'float: none'
     ) %>
   </div>
   <div id="pictures">
@@ -46,7 +46,7 @@
       <%= Alchemy.t(:no_search_results) %>
     </div>
   <% else %>
-    <%= render :partial => 'picture', :collection => @pictures %>
+    <%= render partial: 'picture', collection: @pictures %>
     <%= paginate @pictures, theme: 'alchemy' %>
   <% end %>
   </div>