alchemy_cms 3.3.3 → 3.4.0.rc1

data/app/controllers/alchemy/messages_controller.rb

@@ -68,7 +68,7 @@ module Alchemy
       @page = @element.page
       @root_page = @page.get_language_root
       if @message.valid?
-        Messages.contact_form_mail(@message, mail_to, mail_from, subject).deliver
+        MessagesMailer.contact_form_mail(@message, mail_to, mail_from, subject).deliver
         redirect_to_success_page
       else
         render template: 'alchemy/pages/show'

data/app/controllers/alchemy/pages_controller.rb

@@ -26,6 +26,8 @@ module Alchemy
       if: :run_on_page_layout_callbacks?,
       only: [:index, :show]
 
+    before_action :set_expiration_headers, only: [:index, :show], if: -> { @page }
+
     rescue_from ActionController::UnknownFormat, with: :page_not_found!
 
     # == The index action gets invoked if one requests '/' or '/:locale'
@@ -35,7 +37,7 @@ module Alchemy
     # Loads the current language root page. The current language is either loaded via :locale
     # parameter or, if that's missing, the default language is used.
     #
-    # If this page is not published then it loads the first published descendant it finds.
+    # If this page is not published then it redirects to the first published descendant it finds.
     #
     # If no public page can be found it renders a 404 error.
     #
@@ -45,8 +47,7 @@ module Alchemy
         raise "Remove deprecated `redirect_index` configuration!" if Alchemy.version == "4.0.0.rc1"
         redirect_permanently_to page_redirect_url
       else
-        authorize! :index, @page
-        render_page if render_fresh_page?
+        show
       end
     end
 
@@ -84,13 +85,13 @@ module Alchemy
     #
     # Loads the current public language root page.
     #
-    # If the root page is not public it loads the first published child.
+    # If the root page is not public it redirects to the first published child.
     # This can be configured via +redirect_to_public_child+ [default: true]
     #
     # If no index page and no admin users are present we show the "Welcome to Alchemy" page.
     #
     def load_index_page
-      @page ||= public_root_page || first_public_child
+      @page ||= Language.current_root_page
       render template: 'alchemy/welcome', layout: false if signup_required?
     end
 
@@ -110,26 +111,6 @@ module Alchemy
       )
     end
 
-    # Returns the current language root page, if it's published.
-    #
-    # Otherwise it returns nil.
-    #
-    def public_root_page
-      @root_page ||= Language.current_root_page
-      @root_page if @root_page && @root_page.public?
-    end
-
-    # Returns the first public child of the current language root page.
-    #
-    # If +redirect_to_public_child+ is configured to +false+ it returns +nil+.
-    #
-    def first_public_child
-      if Alchemy::Config.get(:redirect_to_public_child)
-        return unless @root_page
-        @root_page.descendants.published.first
-      end
-    end
-
     # Redirects to given url with 301 status
     def redirect_permanently_to(url)
       redirect_to url, status: :moved_permanently
@@ -170,6 +151,14 @@ module Alchemy
       end
     end
 
+    def set_expiration_headers
+      if @page.cache_page?
+        expires_in @page.expiration_time, public: !@page.restricted
+      else
+        expires_now
+      end
+    end
+
     def set_root_page
       @root_page ||= Language.current_root_page
     end
@@ -200,7 +189,8 @@ module Alchemy
     def render_fresh_page?
       !@page.cache_page? || stale?(etag: page_etag,
         last_modified: @page.published_at,
-        public: !@page.restricted)
+        public: !@page.restricted,
+        template: 'pages/show')
     end
 
     def page_not_found!

data/app/controllers/alchemy/pictures_controller.rb

@@ -1,6 +1,6 @@
 module Alchemy
   class PicturesController < Alchemy::BaseController
-    ALLOWED_IMAGE_TYPES = %w(png jpeg gif)
+    ALLOWED_IMAGE_TYPES = %w(png jpeg gif svg)
 
     caches_page :show, :thumbnail, :zoom
 
@@ -25,7 +25,7 @@ module Alchemy
         @size = params[:size]
       end
 
-      respond_to { |format| send_image(processed_image, format) }
+      respond_to { |format| send_image(processed_image, format, flatten: true) }
     end
 
     def zoom
@@ -45,20 +45,29 @@ module Alchemy
       false
     end
 
-    def send_image(image, format)
+    def send_image(image, format, opts = {})
       request.session_options[:skip] = true
       ALLOWED_IMAGE_TYPES.each do |type|
+        # Flatten animated gifs, only if converting to a different format.
+        # Can be overwritten via +options[:flatten]+.
+        options = {
+          flatten: type != "gif" && image.ext == 'gif'
+        }.merge(opts)
+
         format.send(type) do
-          options = []
+          encoding_options = []
           if type == 'jpeg'
             quality = params[:quality] || Config.get(:output_image_jpg_quality)
-            options << "-quality #{quality}"
+            encoding_options << "-quality #{quality}"
+          end
+          if options[:flatten]
+            encoding_options << "-flatten"
           end
-          # Flatten animated gifs, only if converting to a different format.
-          if type != "gif" && image.ext == 'gif'
-            options << "-flatten"
+          if @picture.has_convertible_format?
+            render text: image.encode(type, encoding_options.join(' ')).data
+          else
+            render text: image.data
           end
-          render text: image.encode(type, options.join(' ')).data
         end
       end
     end
@@ -70,7 +79,7 @@ module Alchemy
       if @image.nil?
         raise MissingImageFileError, "Missing image file for #{@picture.inspect}"
       end
-      if @size.present?
+      if resizable?
         if params[:crop_size].present? && params[:crop_from].present? || params[:crop].present?
           @picture.crop(@size, params[:crop_from], params[:crop_size], @upsample)
         else
@@ -80,5 +89,9 @@ module Alchemy
         @image
       end
     end
+
+    def resizable?
+      @size.present? && @picture.has_convertible_format?
+    end
   end
 end

data/app/controllers/concerns/alchemy/page_redirects.rb

@@ -36,10 +36,14 @@ module Alchemy
     end
 
     def public_child_redirect_url
-      return unless redirect_to_public_child?
+      return if @page.public?
 
-      @page = @page.self_and_descendants.published.not_restricted.first
-      @page ? page_redirect_url : page_not_found!
+      if configuration(:redirect_to_public_child)
+        @page = @page.descendants.published.not_restricted.first
+        @page ? page_redirect_url : page_not_found!
+      else
+        page_not_found!
+      end
     end
 
     def controller_and_action_url
@@ -65,9 +69,5 @@ module Alchemy
     def locale_prefix_missing?
       multi_language? && params[:locale].blank? && !default_locale?
     end
-
-    def redirect_to_public_child?
-      configuration(:redirect_to_public_child) && !@page.public?
-    end
   end
 end

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

@@ -332,38 +332,41 @@ module Alchemy
 
       # Renders a textfield ready to display a datepicker
       #
-      # Uses a HTML5 <tt><input type="date"></tt> field.
+      # Uses a HTML5 +<input type="date">+ field.
+      # A Javascript observer converts this into a fancy Datepicker.
+      # If you pass +'datetime'+ as +:type+ the datepicker will also have a Time select.
       #
-      # === Example
+      # The date value gets localized via +I18n.l+. The format on Time and Date is +datepicker+
+      # or +datetimepicker+, if you pass another +type+.
+      #
+      # === Date Example
       #
       #   <%= alchemy_datepicker(@person, :birthday) %>
       #
+      # === Datetime Example
+      #
+      #   <%= alchemy_datepicker(@page, :public_on, type: 'datetime') %>
+      #
       # @param [ActiveModel::Base] object
       #   An instance of a model
       # @param [String or Symbol] method
       #   The attribute method to be called for the date value
       #
-      # @option html_options [String] :type ('date')
+      # @option html_options [String] :type (date)
       #   The type of text field
-      # @option html_options [String] :class ('thin_border date')
+      # @option html_options [String] :class (type)
       #   CSS classes of the input field
-      # @option html_options [String] :value (object.send(method.to_sym).nil? ? nil : l(object.send(method.to_sym), :format => :datepicker))
-      #   The value the input displays
+      # @option html_options [String] :value (value of method on object)
+      #   The value the input displays. If you pass a String its parsed with +Time.parse+
       #
       def alchemy_datepicker(object, method, html_options = {})
-        value = nil
-        if object.send(method.to_sym).present?
-          value = l(object.send(method.to_sym), format: :datepicker)
-        elsif html_options[:value].present?
-          date = html_options.delete(:value)
-          date = Time.parse(date) if date.is_a?(String)
-          value = l(date, format: :datepicker)
-        end
-        text_field object.class.name.underscore.to_sym, method.to_sym, html_options.merge({
-          type: 'date',
-          class: 'date',
-          value: value
-        })
+        type = html_options.delete(:type) || 'date'
+        date = html_options.delete(:value) || object.send(method.to_sym).presence
+        date = Time.zone.parse(date) if date.is_a?(String)
+        value = date ? l(date, format: "#{type}picker".to_sym) : nil
+
+        text_field object.class.name.demodulize.underscore.to_sym,
+          method.to_sym, {type: type, class: type, value: value}.merge(html_options)
       end
 
       # Merges the params-hash with the given hash

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

@@ -57,25 +57,40 @@ module Alchemy
       end
 
       def essence_picture_thumbnail(content, options)
-        return if content.ingredient.blank?
-        crop = !(content.essence.crop_size.blank? && content.essence.crop_from.blank?) ||
-               (content.settings_value(:crop, options) == true || content.settings_value(:crop, options) == "true")
+        ingredient = content.ingredient
+        essence = content.essence
+        return if ingredient.blank?
+
+        crop = !(essence.crop_size.blank? && essence.crop_from.blank?) ||
+               (
+                 content.settings_value(:crop, options) == true ||
+                 content.settings_value(:crop, options) == "true"
+               )
+
+        size = if essence.render_size.blank?
+                 content.settings_value(:size, options)
+               else
+                 essence.render_size
+               end
+
         image_options = {
-          size: content.essence.thumbnail_size(content.essence.render_size.blank? ? content.settings_value(:size, options) : content.essence.render_size, crop),
-          crop_from: content.essence.crop_from.blank? ? nil : content.essence.crop_from,
-          crop_size: content.essence.crop_size.blank? ? nil : content.essence.crop_size,
+          size: essence.thumbnail_size(size, crop),
+          crop_from: essence.crop_from.blank? ? nil : essence.crop_from,
+          crop_size: essence.crop_size.blank? ? nil : essence.crop_size,
           crop: crop ? 'crop' : nil,
           upsample: content.settings_value(:upsample, options)
         }
+
         image_tag(
           alchemy.thumbnail_path({
-            id: content.ingredient.id,
-            name: content.ingredient.urlname,
-            sh: content.ingredient.security_token(image_options)
+            id: ingredient.id,
+            name: ingredient.urlname,
+            sh: ingredient.security_token(image_options),
+            format: ingredient.image_file_format
           }.merge(image_options)),
-          alt: content.ingredient.name,
+          alt: ingredient.name,
           class: 'img_paddingtop',
-          title: Alchemy.t(:image_name) + ": #{content.ingredient.name}"
+          title: Alchemy.t(:image_name) + ": #{ingredient.name}"
         )
       end
 

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

@@ -22,7 +22,8 @@ module Alchemy
       def combined_page_status(page)
         page.status.map do |state, _value|
           next if state == :locked
-          val = content_tag(:span, '', class: page.send(state) ? "page_status #{state}" : "page_status not_#{state}")
+          css_class = page.send("#{state}?") ? "page_status #{state}" : "page_status not_#{state}"
+          val = content_tag(:span, '', class: css_class)
           val + page.status_title(state)
         end.delete_if(&:blank?).join("<br>").html_safe
       end

data/app/helpers/alchemy/essences_helper.rb

@@ -86,40 +86,5 @@ module Alchemy
     def render_essence_view(content, options = {}, html_options = {})
       render_essence(content, :view, {for_view: options}, html_options)
     end
-
-    # Renders a essence picture
-    #
-    def render_essence_picture_view(content, options, html_options)
-      options = {
-        show_caption: true,
-        disable_link: false
-      }.update(content.settings).update(options)
-      return if content.ingredient.blank?
-      if content.essence.caption.present? && options[:show_caption]
-        caption = content_tag(:figcaption, content.essence.caption, id: "#{dom_id(content.ingredient)}_caption", class: "image_caption")
-      end
-      img_tag = image_tag(
-        content.essence.picture_url(options), {
-          alt: (content.essence.alt_tag.blank? ? nil : content.essence.alt_tag),
-          title: (content.essence.title.blank? ? nil : content.essence.title),
-          class: (caption || content.essence.css_class.blank? ? nil : content.essence.css_class)
-        }.merge(caption ? {} : html_options)
-      )
-      output = caption ? img_tag + caption : img_tag
-      if content.essence.link.present? && !options[:disable_link]
-        output = link_to(url_for(content.essence.link), {
-          title: content.essence.link_title.blank? ? nil : content.essence.link_title,
-          target: (content.essence.link_target == "blank" ? "_blank" : nil),
-          'data-link-target' => content.essence.link_target.blank? ? nil : content.essence.link_target
-        }) do
-          output
-        end
-      end
-      if caption
-        content_tag(:figure, output, {class: content.essence.css_class.blank? ? nil : content.essence.css_class}.merge(html_options))
-      else
-        output
-      end
-    end
   end
 end

data/app/helpers/alchemy/url_helper.rb

@@ -43,7 +43,7 @@ module Alchemy
       url_params = {
         id: picture.id,
         name: picture.urlname,
-        format: configuration(:image_output_format),
+        format: picture.default_render_format,
         sh: picture.security_token(optional_params)
       }
       url_params.update(optional_params.update(crop: optional_params[:crop] ? 'crop' : nil))

data/app/mailers/alchemy/base_mailer.rb

@@ -0,0 +1,18 @@
+module Alchemy
+  begin
+    base_class = Object.const_get('::ApplicationMailer')
+  rescue NameError
+    base_class = ActionMailer::Base
+  end
+
+  # The +BaseMailer+ is the class all Alchemy mailers inherit from.
+  #
+  # Itself inherits from +ApplicationMailer+ when it is defined, or
+  # as a fallback from +ActionMailer::Base+.
+  #
+  # +ApplicationMailer+ is the Rails standard for registering helpers and
+  # setting the default layout. It is only generated though, when you
+  # +rails generate+ a mailer.
+  #
+  class BaseMailer < base_class; end
+end

data/app/mailers/alchemy/{messages.rb → messages_mailer.rb}

@@ -1,5 +1,5 @@
 module Alchemy
-  class Messages < ActionMailer::Base
+  class MessagesMailer < BaseMailer
     def contact_form_mail(message, mail_to, mail_from, subject)
       @message = message
       mail(

data/app/models/alchemy/attachment.rb

@@ -39,6 +39,13 @@ module Alchemy
       def allowed_filetypes
         Config.get(:uploader).fetch('allowed_filetypes', {}).fetch('alchemy/attachments', [])
       end
+
+      def file_types_for_select
+        file_types = Alchemy::Attachment.pluck(:file_mime_type).uniq.map do |type|
+          [Alchemy.t(type, scope: 'mime_types'), type]
+        end
+        file_types.sort_by(&:first)
+      end
     end
 
     validates_presence_of :file
@@ -56,6 +63,8 @@ module Alchemy
 
     after_update :touch_contents
 
+    scope :with_file_type, ->(file_type) { where(file_mime_type: file_type) }
+
     # Instance methods
 
     def to_jq_upload

data/app/models/alchemy/cell.rb

@@ -28,7 +28,7 @@ module Alchemy
     belongs_to :page
     validates_uniqueness_of :name, scope: 'page_id'
     validates_format_of :name, with: /\A[a-z0-9_-]+\z/
-    has_many :elements, -> { where(parent_element_id: nil).order(:position) }, dependent: :destroy
+    has_many :elements, -> { order(:position) }, dependent: :destroy
 
     class << self
       def definitions

data/app/models/alchemy/essence_picture.rb

@@ -126,11 +126,13 @@ module Alchemy
     #
     def picture_params(options = {})
       return {} if picture.nil?
+
       params = {
         id: picture.id,
         name: picture.urlname,
-        format: Config.get(:image_output_format)
+        format: picture.default_render_format
       }.merge(options)
+
       if options[:crop] && crop_from.present? && crop_size.present?
         params = {
           crop: true,
@@ -138,6 +140,7 @@ module Alchemy
           crop_size: crop_size
         }.merge(params)
       end
+
       params = clean_picture_params(params)
       params.merge(sh: picture.security_token(params))
     end